|
@@ -16,7 +16,9 @@ import thyyxxk.webserver.entity.login.UserInfo;
|
|
|
import thyyxxk.webserver.entity.yibao.ZyActpatient;
|
|
|
import thyyxxk.webserver.utils.*;
|
|
|
|
|
|
-import java.util.*;
|
|
|
+import java.util.ArrayList;
|
|
|
+import java.util.List;
|
|
|
+import java.util.Map;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -54,14 +56,17 @@ public class PublicServer {
|
|
|
* @return Boolean
|
|
|
*/
|
|
|
public Boolean needRule(int[] jueSeBianMa) {
|
|
|
- List<Integer> list = Arrays.stream(jueSeBianMa).boxed().collect(Collectors.toList());
|
|
|
- // 始终添加管理员
|
|
|
- list.add(1);
|
|
|
- List<Integer> roleCode = getRoleCode().getData();
|
|
|
+ return getaBoolean(jueSeBianMa, getRoleCode().getData());
|
|
|
+ }
|
|
|
+
|
|
|
+ public Boolean getaBoolean(int[] jueSeBianMa, List<Integer> roleCode) {
|
|
|
if (ListUtil.isBlank(roleCode)) {
|
|
|
return true;
|
|
|
}
|
|
|
- for (Integer i : list) {
|
|
|
+ if (roleCode.contains(1)) {
|
|
|
+ return false;
|
|
|
+ }
|
|
|
+ for (Integer i : jueSeBianMa) {
|
|
|
if (roleCode.contains(i)) {
|
|
|
return false;
|
|
|
}
|
|
@@ -74,18 +79,7 @@ public class PublicServer {
|
|
|
* @return Boolean
|
|
|
*/
|
|
|
public Boolean needRule(List<Integer> role, int[] jueSeBianMa) {
|
|
|
- List<Integer> list = Arrays.stream(jueSeBianMa).boxed().collect(Collectors.toList());
|
|
|
- // 始终添加管理员
|
|
|
- list.add(1);
|
|
|
- if (ListUtil.isBlank(role)) {
|
|
|
- return true;
|
|
|
- }
|
|
|
- for (Integer i : list) {
|
|
|
- if (role.contains(i)) {
|
|
|
- return false;
|
|
|
- }
|
|
|
- }
|
|
|
- return true;
|
|
|
+ return getaBoolean(jueSeBianMa, role);
|
|
|
}
|
|
|
|
|
|
|