1

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

@@ -629,6 +629,7 @@ public class IncidentController {
         List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("区域");
         for(DataDictionary dataDictionary : dataDictionaryList) {
             Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("isFinished", "1");
             searchParams.put("createBy", subject);
             searchParams.put("areaId",dataDictionary.getValue());
 
@@ -663,6 +664,7 @@ public class IncidentController {
         List<DataDictionary> dataDictionaryList = dataDictionaryService.findByCatalogName("工作专班");
         for(DataDictionary dataDictionary : dataDictionaryList) {
             Map<String, Object> searchParams = new HashMap<>();
+            searchParams.put("isFinished", "1");
             searchParams.put("createBy", subject);
             searchParams.put("specialClassId","%"+dataDictionary.getId()+"%");
 
@@ -699,6 +701,7 @@ public class IncidentController {
         int total = 0;
 
         Map<String,Object> searchParams = new HashMap<>();
+        searchParams.put("isFinished", "1");
         searchParams.put("createBy", subject);
 
         List<Role> roleList = userRoleService.findRoleByUserId(subject);