#

LSH

2023-11-02 bd5ab921857b0871f7b7f5b96408dae7239c13a0

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

@@ -88,6 +88,11 @@
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false, value = "dept_id") Long deptId,
                  @RequestParam(required = false, value = "user_id") Long userId){
        if (getUser().getRoleId()!=1){
            if (!getUser().getNickname().equals("陈燕")){
                return R.ok(new Page<Cstmr>());
            }
        }
        List<Integer> ids = new ArrayList<>();
        if (!Cools.isEmpty(followerName)){
            User username = userService.selectOne(new EntityWrapper<User>().eq("username", followerName));
@@ -113,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)
@@ -157,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)
@@ -168,8 +198,13 @@
    }

    @RequestMapping(value = "/cstmr/add/auth")
    @ManagerAuth(memo = "添加甲方单位")
    @ManagerAuth(memo = "添加甲方单位信息公海")
    public R add(Cstmr cstmr) {
        if (getUser().getRoleId()!=1){
            if (!getUser().getNickname().equals("陈燕")){
                return R.error("您没有添加权限");
            }
        }
        Long hostId = getHostId();
        if (cstmrService.selectByUuid(hostId, cstmr.getUuid()) != null) {
            throw new CoolException("客户已存在");