Merge branch '2.0.1' of http://139.186.142.91:10010/r/productDev/yunyibao i...

MrShi

2025-01-12 426718fb2310abff70f54962f118f4300ead2408

 server/service/src/main/java/com/doumee/service/system/impl/SystemDataPermissionServiceImpl.java

@@ -153,6 +153,7 @@
            boolean depart=false;
            boolean departAndLeaf=false;
            boolean custom=false;
            boolean self=false;
            String c = "";
            for(SystemDataPermissionListVO d : list){
                if(!all && Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.all)){
@@ -171,6 +172,9 @@
                    custom =true;
                    c += StringUtils.defaultString(d.getCustomData(),"");
                }
                if(  Constants.equalsInteger(d.getType(),Constants.DATAPERMISSION_TYPE.self)){
                    self =true;
                }
            }
            CompanyDepartment department = new CompanyDepartment();
            department.setId(user.getDepartmentId());
@@ -185,6 +189,8 @@

            if(all){
                return  null;
            }else if(self){
                return  new ArrayList<>();
            }else{
                List<Integer> dList = new ArrayList<>();
                dList.add(-1);//虚拟部门，排查空集合