钥匙柜信息处理

rk

4 天以前 9fdd262881ef10d79e75d8e91d36fef88f774073

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

@@ -3,8 +3,8 @@
import com.baomidou.mybatisplus.core.conditions.Wrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.conditions.update.UpdateWrapper;
import com.doumee.core.model.PageData;
import com.doumee.core.model.PageWrap;
import com.doumee.service.business.third.model.PageData;
import com.doumee.service.business.third.model.PageWrap;
import com.doumee.core.utils.Constants;
import com.doumee.dao.business.dao.CompanyMapper;
import com.doumee.dao.business.model.Company;
@@ -189,13 +189,17 @@
                    custom =true;
                    c += StringUtils.defaultString(d.getCustomData(),"");
                }

            }
            if(!all &&!departAndChild&& !depart && !departAndLeaf && !custom ){
                return  new ArrayList<>();
            }
            Company department = new Company();
            department.setId(user.getCompanyId());

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