|
|
@@ -106,11 +106,24 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
|
|
|
return myAll;
|
|
|
}
|
|
|
public List<String> selectSubDeps(List<String> deps) {
|
|
|
+ return comparePermissions(selectMyDeps(),deps);
|
|
|
+ }
|
|
|
+ @Override
|
|
|
+ public List<String> comparePermissions(List<String> aDep, String deps) {
|
|
|
List<String> myAll=new ArrayList<>();
|
|
|
- List<String> my=selectMyDeps();
|
|
|
- for (String dep : deps) {
|
|
|
- for (String dep2 : my) {
|
|
|
- if (dep.equals(dep2))myAll.add(dep);
|
|
|
+ List<String> input=parseArray(deps);
|
|
|
+ for (String s : aDep) {
|
|
|
+ for (String in : input) {
|
|
|
+ if (s.equals(in))myAll.add(s);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ return myAll;
|
|
|
+ }
|
|
|
+ public List<String> comparePermissions(List<String> aDep, List<String> input) {
|
|
|
+ List<String> myAll=new ArrayList<>();
|
|
|
+ for (String s : aDep) {
|
|
|
+ for (String in : input) {
|
|
|
+ if (s.equals(in))myAll.add(s);
|
|
|
}
|
|
|
}
|
|
|
return myAll;
|
|
|
@@ -123,9 +136,10 @@ public class DepartmentServiceImpl extends BaseMybatisDao<WorkingHoursMapper> im
|
|
|
|
|
|
@Override
|
|
|
public List<String> parseArray(String deps) {
|
|
|
- System.out.println(deps);
|
|
|
return JSON.parseArray(deps,String.class);
|
|
|
}
|
|
|
|
|
|
|
|
|
+
|
|
|
+
|
|
|
}
|