|
@@ -177,8 +177,10 @@ public class SysRoleController {
|
|
|
} else if (rolesIdList.contains(1)) {
|
|
|
queryWrapper.orderByAsc(SysRole::getRoleId);
|
|
|
} else {
|
|
|
+
|
|
|
+ List<Integer> drugEntAdminSuper = Stream.of(3, 4, 5, 6, 7, 39, 40, 41, 42).collect(Collectors.toList());
|
|
|
List<Integer> drugEntAdmin = Stream.of(3, 4, 5, 6, 7).collect(Collectors.toList());
|
|
|
- List<Integer> CSOAdmin = Stream.of(4, 5, 6, 7, 37).collect(Collectors.toList());
|
|
|
+ List<Integer> CSOAdmin = Stream.of(4, 5, 6, 7, 37, 43).collect(Collectors.toList());
|
|
|
List<Integer> CSO2Admin = Stream.of(5, 6, 7, 37).collect(Collectors.toList());
|
|
|
List<Integer> CROAdmin = Stream.of(7, 9, 10).collect(Collectors.toList());
|
|
|
List<Integer> HCPAdmin = Stream.of(7, 11, 13).collect(Collectors.toList());
|
|
@@ -215,6 +217,9 @@ public class SysRoleController {
|
|
|
case 35:
|
|
|
queryRoleIdSet.addAll(bcLeaderAdmin);
|
|
|
break;
|
|
|
+ case 39:
|
|
|
+ queryRoleIdSet.addAll(drugEntAdminSuper);
|
|
|
+ break;
|
|
|
}
|
|
|
});
|
|
|
if (CollUtil.isEmpty(queryRoleIdSet)) {
|