质押合同添加业务经理绑定，H5相关逻辑完善

sgj

12 小时以前 3a5e49666af1da441633b0a9bae4c3c2b18974b3

 fzzy-igdss-core/src/main/java/com/fzzy/igds/service/CoreDeptService.java

@@ -10,6 +10,7 @@
import com.ruoyi.common.core.domain.entity.SysUser;
import com.ruoyi.common.utils.StringUtils;
import org.springframework.stereotype.Service;

import javax.annotation.Resource;
import java.util.Date;
import java.util.List;
@@ -42,18 +43,54 @@
        //获取当前登录人
        SysUser user = ContextUtil.getLoginUser();

        if (Constant.USER_TYPE_10.equals(user.getUserType())) {
       if(null != user){
           if (Constant.USER_TYPE_10.equals(user.getUserType())) {
               //监管用户，直接查询组织下所有库区
               return this.listDept(null,user.getCompanyId(),null);
           }
           if (Constant.USER_TYPE_20.equals(user.getUserType())) {
               //银行用户，根据合同查询银行下所有库区
               return this.getDeptByBank(user.getUserData());
           }
           if (Constant.USER_TYPE_30.equals(user.getUserType())) {
               //库区用户
               String deptId = user.getDeptId() + "";
               if(ContextUtil.isDepotUser(deptId)){
                   //查询用户所属库区
                   return this.listDept(deptId,null,null);
               }else {
                   //查询用户所属公司下所有库区
                   return this.listDept(null,null, deptId);
               }
           }
           return this.listDept(null,user.getCompanyId(),null);

       }
        return this.listDept(null,ContextUtil.getCompanyId(),null);

    }


    /**
     * 根据用户类型获取对应库区列表信息APP
     *
     * @param
     * @return
     */
    public List<Dept> getDeptByUserTypeApp(String userType,String deptId) {


        if (Constant.USER_TYPE_10.equals(userType)) {
            //监管用户，直接查询组织下所有库区
            return this.listDept(null,user.getCompanyId(),null);
            return this.listDept(null,userType,null);
        }
        if (Constant.USER_TYPE_20.equals(user.getUserType())) {
        if (Constant.USER_TYPE_20.equals(userType)) {
            //银行用户，根据合同查询银行下所有库区
            return this.getDeptByContract(user.getUserData());
            return this.getDeptByBank(userType);
        }
        if (Constant.USER_TYPE_30.equals(user.getUserType())) {
        if (Constant.USER_TYPE_30.equals(userType)) {
            //库区用户
            String deptId = user.getDeptId() + "";
            if(deptId.length() > 7){
            if(ContextUtil.isDepotUser(deptId)){
                //查询用户所属库区
                return this.listDept(deptId,null,null);
            }else {
@@ -61,20 +98,17 @@
                return this.listDept(null,null, deptId);
            }
        }
        return this.listDept(null,user.getCompanyId(),null);
        return this.listDept(null,ContextUtil.getCompanyId(),null);
    }

    /**
     * 根据银行id，关联合同表查询库区列表
     * @param bankId
     * @param bankId 银行号
     * @return
     */
    public List<Dept> getDeptByContract(String bankId) {

    public List<Dept> getDeptByBank(String bankId) {
        if (StringUtils.isBlank(bankId)){
            return null;
        }

        QueryWrapper<PledgeContract> queryWrapper = new QueryWrapper<>();
        queryWrapper.eq("c.pledge_bank", bankId);