#

LSH

2023-11-07 cb3870820f63e6f7ba595d80dcbbfd3deae6fdf6

 src/main/java/com/zy/crm/manager/controller/CstmrController.java

@@ -118,10 +118,23 @@

            }
        }

        Long director = null;
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
            }else if (getRole().getId()==2){
                deptId = getDeptId();
                userId = null;
            }
//            director = getUserId();
        }

        return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , userId
                , director
                , Cools.isEmpty(followerName) ? null : ids
                , conditionName
                , condition)
@@ -162,10 +175,22 @@

            }
        }
        Long director = null;
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
            }else if (getRole().getId()==2){
                deptId = getDeptId();
                userId = null;
            }
            director = getUserId();
        }

        return R.ok(cstmrService.getPage33(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , userId
                , director
                , Cools.isEmpty(followerName) ? null : ids
                , conditionName
                , condition)
@@ -206,6 +231,35 @@
        return R.ok();
    }

    @RequestMapping(value = "/cstmr/add2/auth")
    @ManagerAuth(memo = "添加甲方单位信息公海")
    public R add22(Cstmr cstmr) {
        Long hostId = getHostId();
        if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
            throw new CoolException("客户已存在");
        }
        if (cstmrService.selectByName(hostId, cstmr.getName()) != null) {
            throw new CoolException("客户已存在");
        }
        Cstmr cstmr1 = cstmrService.selectByName(hostId, cstmr.getName());
        if (cstmr1!=null){
            throw new CoolException("该客户信息已存在，业务员是:"+cstmr1.getDirector$());
        }
        cstmr.setHostId(hostId);
        cstmr.setUuid(cstmrService.getUuid(hostId));  // 客户代号
        cstmr.setDeptId(getDeptId());               // 所属部门
        cstmr.setUserId(getUserId());               // 所属人员

        cstmr.setCreateBy(getUserId());
        cstmr.setCreateTime(new Date());
        cstmr.setUpdateBy(getUserId());
        cstmr.setUpdateTime(new Date());
        cstmr.setDirector(getUserId());
        cstmr.setStatus(1);
        cstmrService.insert(cstmr);
        return R.ok();
    }

    @RequestMapping(value = "/cstmr2/add/auth")
    @ManagerAuth(memo = "接取甲方单位")
    public R add2(Cstmr cstmr) {
@@ -214,6 +268,10 @@
            return R.error("你无法接取此甲方单位!");
        }
        cstmr1.setDirector(getUserId());
        cstmr.setDeptId(getDeptId());               // 所属部门
        cstmr.setUserId(getUserId());               // 所属人员
        cstmr.setUpdateBy(getUserId());
        cstmr.setUpdateTime(new Date());
        cstmrService.updateById(cstmr1);
        return R.ok();
    }