Merge branch 'master' of http://git.yvanui.com/hust/wuhan_epi

admin-ui/app/whepi/home/selectLYbumen.js

@@ -12,7 +12,7 @@ define(function (require) {
         pagination: false,
         autoSizeColumns: true,
         queryParams: {query: context.query},
-        // idField: 'userId',
+        idField: 'unitId',
         columns: [[
           {title: 'ID', field: 'unitId', hidden: true},
           {title: '部门', field: 'unit'},

whepi-web/src/main/java/com/bofeng/dao/UptownUnitMapper.java

@@ -45,6 +45,6 @@ public interface UptownUnitMapper extends BaseMapper<UptownUnit> {
     List<UptownUnit> getUptownUnitLY(@Param("uptownId") Long uptownId);
 
 
-    @Select("select unit_id,CONCAT(ridgepole,unit) as unit from sys_uptown_unit where status = 1 and uptown_id = 1238790987234")
-    List<UptownUnit>  getDLYbumen(PageDb pagination);
+    @Select("select * from(select unit_id,CONCAT(ridgepole,unit) as unit from sys_uptown_unit where status = 1 and uptown_id = 1238790987234) tt where unit like concat('%', #{unit}, '%')")
+    List<UptownUnit> getDLYbumen(@Param("unit") String unit);
 }

whepi-web/src/main/java/com/bofeng/wx/controller/ScanAdminController.java

@@ -227,8 +227,8 @@ public class ScanAdminController {
 
     @ApiOperation("获取部门数据")
     @PostMapping("/whepi/qrImg/getDLYbumen")
-    public Model<List<UptownUnit>> getDLYbumen(HttpParameterParser parser, PageDb pagination) {
-        return Model.newSuccess(pagination, uptownUnitMapper.getDLYbumen(pagination));
+    public Model<List<UptownUnit>> getDLYbumen(@Pd(name = "query", required = false, defaultValue = "") String query) {
+        return Model.newSuccess(uptownUnitMapper.getDLYbumen(query));
     }
 
     @ApiOperation("保存小区大门信息")