Merge remote-tracking branch 'origin/zycrm' into zycrm

Junjie

2023-11-10 cbc9250b33a955bc919a6afc5d4101ef65bbfafa

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

@@ -72,12 +72,15 @@
    }

    private <T> void convert(Map<String, Object> map, EntityWrapper<T> wrapper){
        Long deptId = getDeptId();
        boolean signUserId = false;
        boolean signDeptId = false;
        boolean signHostId = false;
        for (Map.Entry<String, Object> entry : map.entrySet()){
            if (entry.getKey().equals("dept_id")){
                signDeptId = true;
                if (String.valueOf(entry.getValue()).equals("19")){
                    signHostId = true;
                }
            }
        }
        for (Map.Entry<String, Object> entry : map.entrySet()){
@@ -100,6 +103,9 @@
        if (!signUserId && !signDeptId){
            wrapper.eq("user_id", getUserId());
        }
        if (signHostId){
            wrapper.or().eq("host_id",1);
        }
    }

    @RequestMapping(value = "/priOnline/add/auth")