|
@@ -568,11 +568,11 @@ public class IncidentController {
|
|
|
sortList.add(new Sort("batch_","asc"));
|
|
|
sortList.add(new Sort("serial_no","asc"));
|
|
|
|
|
|
-// List<Role> roleList = userRoleService.findRoleByUserId(subject);
|
|
|
-// for(Role role : roleList) {
|
|
|
-// if("8d4dd9ac-dcf4-4178-885c-fd309f4be8f6".equals(role.getId()))
|
|
|
-// searchParams.put("createBy", null);
|
|
|
-// }
|
|
|
+ List<Role> roleList = userRoleService.findRoleByUserId(subject);
|
|
|
+ for(Role role : roleList) {
|
|
|
+ if("8d4dd9ac-dcf4-4178-885c-fd309f4be8f6".equals(role.getId()))
|
|
|
+ searchParams.put("orOrgId", null);
|
|
|
+ }
|
|
|
|
|
|
//搜索条件
|
|
|
if (StringUtils.isNotEmpty(batch)) {
|