由于搜索问题，专班改存ID

common/src/main/resources/mapper/sys/User.xml

@@ -113,6 +113,9 @@
         <if test="searchParams.orgId != null">
             and a.org_id = #{searchParams.orgId}
         </if>
+        <if test="searchParams.specialClassId != null">
+            and a.special_class_id like #{searchParams.specialClassId}
+        </if>
         <if test="searchParams.roleId != null">
             and b.role_id = #{searchParams.roleId}
         </if>

web/src/main/java/com/jpsoft/excellent/modules/base/controller/IncidentController.java

@@ -526,8 +526,7 @@ public class IncidentController {
                 List<String> nameList = new ArrayList<>();
                 String[] ids = incident.getSpecialClassId().split(",");
                 for(String id : ids){
-                    DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("工作专班",id);
-                    nameList.add(dataDictionary.getName());
+                    nameList.add(dataDictionaryService.getName(id));
                 }
                 incident.setSpecialClassName(String.join(",", nameList));
             }
@@ -594,8 +593,7 @@ public class IncidentController {
                 List<String> nameList = new ArrayList<>();
                 String[] ids = incident.getSpecialClassId().split(",");
                 for(String id : ids){
-                    DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("工作专班",id);
-                    nameList.add(dataDictionary.getName());
+                    nameList.add(dataDictionaryService.getName(id));
                 }
                 incident.setSpecialClassName(String.join(",", nameList));
             }
@@ -666,7 +664,7 @@ public class IncidentController {
         for(DataDictionary dataDictionary : dataDictionaryList) {
             Map<String, Object> searchParams = new HashMap<>();
             searchParams.put("createBy", subject);
-            searchParams.put("specialClassId","%"+dataDictionary.getValue()+"%");
+            searchParams.put("specialClassId","%"+dataDictionary.getId()+"%");
 
             List<Role> roleList = userRoleService.findRoleByUserId(subject);
             for(Role role : roleList) {
@@ -772,8 +770,7 @@ public class IncidentController {
                 List<String> nameList = new ArrayList<>();
                 String[] ids = incident.getSpecialClassId().split(",");
                 for(String id : ids){
-                    DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("工作专班",id);
-                    nameList.add(dataDictionary.getName());
+                    nameList.add(dataDictionaryService.getName(id));
                 }
                 incident.setSpecialClassName(String.join(",", nameList));
             }
@@ -861,8 +858,7 @@ public class IncidentController {
                 List<String> nameList = new ArrayList<>();
                 String[] ids = incident.getSpecialClassId().split(",");
                 for(String id : ids){
-                    DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("工作专班",id);
-                    nameList.add(dataDictionary.getName());
+                    nameList.add(dataDictionaryService.getName(id));
                 }
                 incident.setSpecialClassName(String.join(",", nameList));
             }

web/src/main/java/com/jpsoft/excellent/modules/mobile/IncidentApiController.java

@@ -148,8 +148,7 @@ public class IncidentApiController {
             List<String> nameList = new ArrayList<>();
             String[] specialClassIds = incident.getSpecialClassId().split(",");
             for(String specialClassId : specialClassIds){
-                DataDictionary dataDictionary = dataDictionaryService.findByCatalogNameAndValue("工作专班",specialClassId);
-                nameList.add(dataDictionary.getName());
+                nameList.add(dataDictionaryService.getName(specialClassId));
             }
             incident.setSpecialClassName(String.join(",", nameList));
             incident.setNewStep(new IncidentStep());

web/src/main/java/com/jpsoft/excellent/modules/sys/controller/UserController.java

@@ -256,7 +256,7 @@ public class UserController {
     @ApiOperation(value="列表")
     @RequestMapping(value = "pageList",method = RequestMethod.POST)
     public MessageResult<Map> pageList(
-            String userName,String realName,String orgId, String roleId,
+            String userName,String realName,String orgId, String roleId, String specialClassId,
             @RequestParam(name="pageIndex",defaultValue = "1") int pageIndex,
             @RequestParam(name="pageSize",defaultValue = "10") int pageSize,
             @RequestAttribute String subject){
@@ -279,6 +279,10 @@ public class UserController {
             searchParms.put("orgId", orgId);
         }
 
+        if (StringUtils.isNotEmpty(specialClassId) && !"null".equals(specialClassId)) {
+            searchParms.put("specialClassId","%" + specialClassId + "%");
+        }
+
         if (StringUtils.isNotEmpty(roleId)) {
             searchParms.put("roleId", roleId);
         }