#

LSH

2023-11-01 de8cae943c4cf3ff12bb4781fe122edbdf66b0c1

#

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

@@ -92,8 +92,14 @@
            }
        }
        if (!signUserId && !signDeptId){
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
            wrapper.eq("user_id", getUserId());
        }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
        }

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

@@ -89,8 +89,14 @@
            }
        }
        if (!signUserId && !signDeptId){
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
            wrapper.eq("user_id", getUserId());
        }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
        }

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

@@ -105,8 +105,14 @@
            }
        }
        if (!signUserId && !signDeptId){
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
            wrapper.eq("user_id", getUserId());
        }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
        }

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

@@ -118,9 +118,19 @@

            }
        }

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

        return R.ok(cstmrService.getPage3(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
                , deptId == null ? null : String.valueOf(deptId)
                , userId
                , Cools.isEmpty(followerName) ? null : ids
                , conditionName
@@ -162,10 +172,19 @@

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

        return R.ok(cstmrService.getPage33(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? null : String.valueOf(deptId)
                , userId == null ? getUserId() : userId
                , userId
                , Cools.isEmpty(followerName) ? null : ids
                , conditionName
                , condition)

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

@@ -64,9 +64,19 @@
        if (param.get("status") != null) {
            status = Integer.parseInt(param.get("status").toString());
        }

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

        return R.ok(orderService.getPage(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
                , deptId == null ? null : String.valueOf(deptId)
                , userId
                , condition
                , status)

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

@@ -89,9 +89,18 @@
                  @RequestParam(required = false) String condition,
                  @RequestParam(required = false, value = "dept_id") Long deptId,
                  @RequestParam(required = false, value = "user_id") Long userId) {
        if (deptId==null && userId == null){
            if (getRole().getId()==3){
                userId = getUserId();
            }else if (getRole().getId()==2){
                deptId = getDeptId();
                userId = null;
            }
        }

        return R.ok(planService.getPage(new Page<>(curr, limit)
                , getHostId()
                , deptId == null ? (userId == null? getDeptId().toString(): null) : String.valueOf(deptId)
                , deptId == null ? null : String.valueOf(deptId)
                , userId
                , condition)
        );

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

@@ -128,8 +128,14 @@
            }
        }
        if (!signUserId && !signDeptId){
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
            wrapper.eq("user_id", getUserId());
        }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
        }

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

@@ -124,8 +124,14 @@
            }
        }
        if (!signUserId && !signDeptId){
            if (getRole().getId()==1){
                wrapper.or().eq("host_id",1);
            }else if (getRole().getId()==2){
                wrapper.eq("dept_id",getDeptId());
            }else {
            wrapper.eq("user_id", getUserId());
        }
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
        }

 src/main/resources/mapper/PlanMapper.xml

@@ -83,7 +83,12 @@
            <otherwise>
                and
                (
                    <if test="condition != null and condition != ''">
                    user_id = #{userId}
                    </if>
                    <if test="condition == null or condition == ''">
                        user_id is not null
                    </if>
                    or
                    mp.id in
                    (