1

common/src/main/java/com/jpsoft/excellent/modules/sys/entity/User.java

@@ -35,4 +35,5 @@ public class User {
 	private String orgName;
 	private String phone;
 	private String specialClassId;
+	private String specialClassName;
 }

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

@@ -101,7 +101,6 @@
     <select id="search" parameterType="hashmap" resultMap="UserMap">
         <![CDATA[
 			select a.* from sys_user a
-			LEFT JOIN sys_user_role b ON a.id_ = b.user_id
 			where a.del_flag = 0
 		]]>
         <if test="searchParams.userName != null">
@@ -116,9 +115,6 @@
         <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>
         <foreach item="sort" collection="sortList" open="order by" separator=",">
             ${sort.name} ${sort.order}
         </foreach>

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

@@ -202,6 +202,7 @@ public class IncidentController {
         try {
             //督办事件
             Incident incident = incidentService.get(id);
+            incident.setSpecialClassName(dataDictionaryService.getName(incident.getSpecialClassId()));
             incident.setNewStep(new IncidentStep());
             //附件列表
             List<IncidentAttachment> incidentAttachmentList1 = incidentAttachmentService.findListByIncidentId(id,"1");
@@ -521,7 +522,8 @@ public class IncidentController {
         searchParams.put("createBy", subject);
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("batch_","asc"));
+        sortList.add(new Sort("serial_no","asc"));
 
         //当角色为高级用户时，查看所有案件
         List<Role> roleList = userRoleService.findRoleByUserId(subject);
@@ -585,11 +587,12 @@ public class IncidentController {
 
         Map<String,Object> searchParams = new HashMap<>();
         searchParams.put("isFinished", "1");
-        searchParams.put("createBy", subject);
+//        searchParams.put("createBy", subject);
 
         List<Sort> sortList = new ArrayList<>();
 //        sortList.add(new Sort("a.warn_time","asc"));
-        sortList.add(new Sort("create_time","desc"));
+        sortList.add(new Sort("batch_","asc"));
+        sortList.add(new Sort("serial_no","asc"));
 
         List<Role> roleList = userRoleService.findRoleByUserId(subject);
         for(Role role : roleList) {

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

@@ -289,12 +289,15 @@ public class DataDictionaryController {
     @ApiImplicitParams({
             @ApiImplicitParam(name = "catalogName",value = "数据目录名称", required = true, paramType = "form",dataType = "String"),
     })
-    public MessageResult<List> findByCatalogName(String catalogName){
+    public MessageResult<List> findByCatalogName(String catalogName,@RequestAttribute String subject){
         MessageResult<List> messageResult = new MessageResult<>();
 
         try {
             //todo
             List<DataDictionary> list = dataDictionaryService.findByCatalogName(catalogName);
+            if(catalogName.equals("督办处置类型") && !subject.equals("a85dde35-21b8-47e9-987e-dc51c594270e")){
+                list.remove(0);
+            }
             messageResult.setData(list);
 
             messageResult.setResult(true);

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

@@ -261,7 +261,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 specialClassId,
+            String userName,String realName,String orgId, String specialClassId,
             @RequestParam(name="pageIndex",defaultValue = "1") int pageIndex,
             @RequestParam(name="pageSize",defaultValue = "10") int pageSize,
             @RequestAttribute String subject){
@@ -288,10 +288,6 @@ public class UserController {
             searchParms.put("specialClassId","%" + specialClassId + "%");
         }
 
-        if (StringUtils.isNotEmpty(roleId)) {
-            searchParms.put("roleId", roleId);
-        }
-
         Page<User> page = userService.pageSearch(searchParms,pageIndex,pageSize,sortList);
         for(User user :page.getResult()){
             if(StringUtils.isNotEmpty(user.getOrgId())) {
@@ -303,6 +299,7 @@ public class UserController {
                     user.setOrgName("--");
                 }
             }
+            user.setSpecialClassName(dataDictionaryService.getName(user.getSpecialClassId()));
         }
 
         msgResult.setResult(true);