From 751aa308846652d4f975f666d86f2e58120f6c88 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Wed, 28 May 2025 17:40:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../device/DevTowerDataCollideMapper.xml      |  2 +
 .../mapper/device/DevTowerDataLimitMapper.xml |  2 +
 .../mapper/device/DevTowerDataLocalMapper.xml |  2 +
 .../mapper/device/DevTowerDataRoundMapper.xml |  2 +
 .../mapper/device/DevTowerDataRunMapper.xml   |  2 +
 .../device/DevTowerDataWarningMapper.xml      |  2 +
 .../device/DevTowerProjectConfigMapper.xml    |  4 +-
 .../yanzhu/job/task/AttendanceJgwTask.java    | 69 ++++++++++++++++++-
 .../job/QuartzProSubdeptsGroupMapper.xml      |  5 +-
 .../service/impl/BasSignetServiceImpl.java    |  2 +-
 .../service/impl/BasTemplateServiceImpl.java  |  2 +-
 .../service/impl/BusExamInfoServiceImpl.java  |  6 +-
 .../impl/BusExamQuestionServiceImpl.java      |  6 +-
 .../service/impl/BusExamUserServiceImpl.java  |  6 +-
 .../impl/BusTrainingVideoServiceImpl.java     | 12 ++--
 .../impl/BusTrainingVideoUserServiceImpl.java |  6 +-
 .../impl/DevAiProjectConfigServiceImpl.java   |  6 +-
 .../impl/DevAiProjectDataServiceImpl.java     |  2 +-
 .../impl/DevIotConfigPointServiceImpl.java    |  6 +-
 .../service/impl/DevIotConfigServiceImpl.java |  2 +-
 .../service/impl/DevIotDatasServiceImpl.java  |  2 +-
 .../impl/DevIotWarningServiceImpl.java        |  2 +-
 .../impl/DevTowerDataCollideServiceImpl.java  |  5 ++
 .../impl/DevTowerDataLimitServiceImpl.java    |  5 ++
 .../impl/DevTowerDataLocalServiceImpl.java    |  5 ++
 .../impl/DevTowerDataRoundServiceImpl.java    |  5 ++
 .../impl/DevTowerDataRunServiceImpl.java      |  5 ++
 .../impl/DevTowerDataWarningServiceImpl.java  |  5 ++
 .../DevTowerProjectConfigServiceImpl.java     |  4 ++
 ...roProjectInfoSubdeptsGroupServiceImpl.java |  4 +-
 .../ProProjectInfoSubdeptsServiceImpl.java    |  4 +-
 .../service/impl/WxMenuConfigServiceImpl.java |  6 +-
 .../views/device/towerDataCollide/index.vue   |  4 +-
 .../src/views/device/towerDataLimit/index.vue |  4 +-
 .../src/views/device/towerDataRound/index.vue |  4 +-
 .../src/views/device/towerDataRun/index.vue   |  4 +-
 .../views/device/towerProjectConfig/index.vue |  6 +-
 37 files changed, 174 insertions(+), 46 deletions(-)

diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
index f494b019..b5d6333a 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataCollideMapper.xml
@@ -74,6 +74,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and dtdc.project_id = #{projectId}</if>
             <if test="comId != null "> and dtdc.com_id = #{comId}</if>
             <if test="deptId != null "> and dtdc.dept_id = #{deptId}</if>
+            <if test="activeComId != null "> and dtdc.com_id = #{activeComId}</if>
+            <if test="activeProjectId != null "> and dtdc.project_id = #{activeProjectId}</if>
             <if test="projectName != null and projectName != ''"> and dtdc.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
             <if test="comName != null and comName != ''"> and dtdc.com_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdc.device_key = #{deviceKey}</if>
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
index 1ea8f06c..3fc2eabb 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLimitMapper.xml
@@ -75,6 +75,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
             <if test="comId != null "> and dtdl.com_id = #{comId}</if>
             <if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
+            <if test="activeComId != null "> and dtdl.com_id = #{activeComId}</if>
+            <if test="activeProjectId != null "> and dtdl.project_id = #{activeProjectId}</if>
             <if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
             <if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
index ca311b90..725c4fb6 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataLocalMapper.xml
@@ -89,6 +89,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and dtdl.project_id = #{projectId}</if>
             <if test="comId != null "> and dtdl.com_id = #{comId}</if>
             <if test="deptId != null "> and dtdl.dept_id = #{deptId}</if>
+            <if test="activeComId != null "> and dtdl.com_id = #{activeComId}</if>
+            <if test="activeProjectId != null "> and dtdl.project_id = #{activeProjectId}</if>
             <if test="projectName != null and projectName != ''"> and dtdl.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
             <if test="comName != null and comName != ''"> and dtdl.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdl.device_key = #{deviceKey}</if>
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
index 3fafc0c2..027dfa10 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRoundMapper.xml
@@ -106,6 +106,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
             <if test="comId != null "> and dtdr.com_id = #{comId}</if>
             <if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
+            <if test="activeComId != null "> and dtdr.com_id = #{activeComId}</if>
+            <if test="activeProjectId != null "> and dtdr.project_id = #{activeProjectId}</if>
             <if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
             <if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
index bbecdeba..351e56cd 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataRunMapper.xml
@@ -94,6 +94,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and dtdr.project_id = #{projectId}</if>
             <if test="comId != null "> and dtdr.com_id = #{comId}</if>
             <if test="deptId != null "> and dtdr.dept_id = #{deptId}</if>
+            <if test="activeComId != null "> and dtdr.com_id = #{activeComId}</if>
+            <if test="activeProjectId != null "> and dtdr.project_id = #{activeProjectId}</if>
             <if test="projectName != null and projectName != ''"> and dtdr.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
             <if test="comName != null and comName != ''"> and dtdr.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdr.device_key = #{deviceKey}</if>
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
index fb3b349f..65e4352c 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerDataWarningMapper.xml
@@ -79,6 +79,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="projectId != null "> and dtdw.project_id = #{projectId}</if>
             <if test="comId != null "> and dtdw.com_id = #{comId}</if>
             <if test="deptId != null "> and dtdw.dept_id = #{deptId}</if>
+            <if test="activeComId != null "> and dtdw.com_id = #{activeComId}</if>
+            <if test="activeProjectId != null "> and dtdw.project_id = #{activeProjectId}</if>
             <if test="projectName != null and projectName != ''"> and dtdw.project_id in (select spv.dept_id from sys_dept spv where spv.dept_name like concat('%', #{projectName}, '%'))</if>
             <if test="comName != null and comName != ''"> and dtdw.dept_id in (select sdv.dept_id from sys_dept sdv where sdv.dept_name like concat('%', #{comName}, '%'))</if>
             <if test="deviceKey != null  and deviceKey != ''"> and dtdw.device_key = #{deviceKey}</if>
diff --git a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
index fd33b28a..f0caa0aa 100644
--- a/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
+++ b/yanzhu-common/yanzhu-common-mapper/src/main/resources/mapper/device/DevTowerProjectConfigMapper.xml
@@ -75,17 +75,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     <select id="selectDevTowerProjectConfigList" parameterType="DevTowerProjectConfig" resultMap="DevTowerProjectConfigResult">
         <include refid="selectDevTowerProjectConfigVo"/>
         <where>
-            dtpc.is_del = 0
             <if test="projectId != null "> and dtpc.project_id = #{projectId}</if>
             <if test="projectName != null and projectName != ''"> and sp.projectName like concat('%', #{projectName}, '%')</if>
             <if test="comId != null "> and dtpc.com_id = #{comId}</if>
             <if test="deptId != null "> and dtpc.dept_id = #{deptId}</if>
+            <if test="activeComId != null "> and dtpc.com_id = #{activeComId}</if>
+            <if test="activeProjectId != null "> and dtpc.project_id = #{activeProjectId}</if>
             <if test="comName != null and comName != ''"> and sd.dept_name like concat('%', #{comName}, '%')</if>
             <if test="deviceSn != null  and deviceSn != ''"> and dtpc.device_sn like concat('%', #{deviceSn}, '%')</if>
             <if test="deviceName != null  and deviceName != ''"> and dtpc.device_name like concat('%', #{deviceName}, '%')</if>
             <if test="deviceSource != null  and deviceSource != ''"> and dtpc.device_source = #{deviceSource}</if>
             <if test="towerId != null  and towerId != ''"> and dtpc.tower_id = #{towerId}</if>
             <if test="towerType != null  and towerType != ''"> and dtpc.tower_type = #{towerType}</if>
+            and dtpc.is_del = 0
         </where>
         order by dtpc.id desc
     </select>
diff --git a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
index 1aaea9db..5e9050e5 100644
--- a/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
+++ b/yanzhu-modules/yanzhu-job/src/main/java/com/yanzhu/job/task/AttendanceJgwTask.java
@@ -164,6 +164,7 @@
 //            for (int i = 0; i < arr.size(); i++) {
 //                JSONObject json = arr.getJSONObject(i);
 //                String subDeptType = convertSubDeptType(json.getString("corpType"));
+//                // 总包单位不同步
 //                if(!"1".equals(subDeptType)){
 //                    rowId = json.getLong("id");
 //                    QuartzProSubdepts quartzProSubdeptsQuery = new QuartzProSubdepts();
@@ -173,6 +174,7 @@
 //                    List<QuartzProSubdepts> list = quartzProSubdeptsService.selectQuartzProSubdeptsList(quartzProSubdeptsQuery);
 //                    if(StringUtils.isNotEmpty(list)){
 //                        QuartzProSubdepts quartzProSubdepts = list.get(0);
+//                        quartzProSubdepts.setSubDeptType(subDeptType);
 //                        quartzProSubdepts.setSubDeptName(json.getString("corpName"));
 //                        quartzProSubdepts.setSubDeptCode(json.getString("corpCode"));
 //                        quartzProSubdepts.setSubDeptLeaderName(json.getString("pmName"));
@@ -188,6 +190,7 @@
 //                        subDeptInfos.put("businessAddress",json.getString("businessAddress"));
 //                        subDeptInfos.put("officePhone",json.getString("officePhone"));
 //                        quartzProSubdepts.setSubDeptInfos(JSON.toJSONString(subDeptInfos));
+//                        quartzProSubdepts.setSource(code.toUpperCase());
 //                        quartzProSubdeptsService.updateQuartzProSubdepts(quartzProSubdepts);
 //                    }else{
 //                        QuartzProSubdepts quartzProSubdepts = new QuartzProSubdepts();
@@ -211,7 +214,7 @@
 //                        quartzProSubdepts.setSubDeptInfos(JSON.toJSONString(subDeptInfos));
 //                        quartzProSubdepts.setUseStatus(UseStateEnums.IN.getCode());
 //                        quartzProSubdepts.setApproveStatus(ApproveStatus.passed.getCode());
-//                        quartzProSubdepts.setSource(code);
+//                        quartzProSubdepts.setSource(code.toUpperCase());
 //                        quartzProSubdeptsService.insertQuartzProSubdepts(quartzProSubdepts);
 //                    }
 //                }
@@ -284,13 +287,15 @@
 //            long rowId = 0;
 //            for (int i = 0; i < arr.size(); i++) {
 //                JSONObject json = arr.getJSONObject(i);
+//                String subDeptType = convertSubDeptType(json.getString("corpType"));
 //                QuartzProSubdeptsGroup quartzProSubdeptsGroupQuery = new QuartzProSubdeptsGroup();
 //                quartzProSubdeptsGroupQuery.setComId(it.getComId());
 //                quartzProSubdeptsGroupQuery.setProjectId(it.getProjectId());
 //                quartzProSubdeptsGroupQuery.setGroupName(json.getString("teamName"));
 //                List<QuartzProSubdeptsGroup> list = quartzProSubdeptsGroupService.selectQuartzProSubdeptsGroupList(quartzProSubdeptsGroupQuery);
 //                if(StringUtils.isNotEmpty(list)){
-//
+//                    QuartzProSubdeptsGroup quartzProSubdeptsGroup = list.get(0);
+//                    quartzProSubdeptsGroup
 //                }else{
 //
 //                }
@@ -316,6 +321,66 @@
 //        }
 //    }
 //
+//    /**
+//     * 转换工种类型
+//     * @param jobTypes
+//     * @return
+//     */
+//    private Map<String, String> convertSubJobTypes(String jobTypes){
+//        Map<String, String> dataMap = new HashMap<>();
+//        switch (jobTypes){
+//            case "3001" : dataMap.put("type","2");dataMap.put("post","1015"); break;
+//            case "3002" : dataMap.put("type","2");dataMap.put("post","1014"); break;
+//            case "3003" :
+//            case "3004" : dataMap.put("type","2");dataMap.put("post","2021"); break;
+//            case "3005" : dataMap.put("type","2");dataMap.put("post","2022"); break;
+//            case "3006" : dataMap.put("type","2");dataMap.put("post","1013"); break;
+//            case "3007" : dataMap.put("type","1");dataMap.put("post","1006"); break;
+//            case "3008" : dataMap.put("type","1");dataMap.put("post","1004"); break;
+//            case "3009" : dataMap.put("type","1");dataMap.put("post","1001"); break;
+//            case "3010" : dataMap.put("type","1");dataMap.put("post","1003"); break;
+//            case "3011" : dataMap.put("type","1");dataMap.put("post","1017"); break;
+//            case "3012" : dataMap.put("type","1");dataMap.put("post","1007"); break;
+//            case "3013" : dataMap.put("type","1");dataMap.put("post","1008"); break;
+//            case "3014" : dataMap.put("type","1");dataMap.put("post","1009"); break;
+//            case "3015" : dataMap.put("type","1");dataMap.put("post","1012"); break;
+//            case "3016" : dataMap.put("type","3");dataMap.put("post","3024"); break;
+//            case "3017" : dataMap.put("type","1");dataMap.put("post","1010"); break;
+//            case "3018" : dataMap.put("type","3");dataMap.put("post","3025"); break;
+//            case "3071" :
+//            case "3019" : dataMap.put("type","2");dataMap.put("post","2017"); break;
+//            case "3020" : dataMap.put("type","2");dataMap.put("post","2018"); break;
+//            case "3021" : dataMap.put("type","2");dataMap.put("post","2016"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3032" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            case "3031" : dataMap.put("type","2");dataMap.put("post","2019"); break;
+//            default : subDeptType = "99"; break;
+//        }
+//        return subDeptType;
+//    }
+//
 //    private String getWorkTypeName(String appid, String token, String type, String key) {
 //        String ckey = "attendance_jgw_work_type_" + type;
 //        Object obj = redisService.getCacheObject(ckey);
diff --git a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml
index 1bf9921c..7850ac84 100644
--- a/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml
+++ b/yanzhu-modules/yanzhu-job/src/main/resources/mapper/job/QuartzProSubdeptsGroupMapper.xml
@@ -37,13 +37,10 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectQuartzProSubdeptsGroupVo">
-        select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, dic0.dict_label as sub_dept_type_name, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, dic1.dict_label as craft_type_name, psg.craft_post, dic2.dict_label as craft_post_name, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark, psg.source
+        select psg.id, psg.com_id, sd.dept_name as com_name, psg.project_id, pi.project_name, psg.sub_dept_id, psg.sub_dept_type, psg.sub_dept_name, psg.sub_dept_code, psg.group_name, psg.group_code, psg.craft_type, psg.craft_post, psg.group_leader_name, psg.group_leader_code, psg.group_leader_phone, psg.use_status, psg.approve_status, psg.qr_code, psg.is_del, psg.create_by, psg.create_time, psg.update_by, psg.update_time, psg.remark, psg.source
         from pro_project_info_subdepts_group psg
         left join pro_project_info pi on pi.id = psg.project_id
         left join sys_dept sd on sd.dept_id = psg.com_id
-        left join sys_dict_data dic0 on psg.`sub_dept_type`=dic0.`dict_value` and dic0.`dict_type`='sub_dept_type'
-        left join sys_dict_data dic1 on psg.`craft_type`=dic1.`dict_value` and dic1.`dict_type`='pro_craft_type'
-        left join sys_dict_data dic2 on psg.`craft_post`=dic2.`dict_value` and dic2.`dict_type`='pro_craft_post'
     </sql>
 
     <select id="selectQuartzProSubdeptsGroupList" parameterType="QuartzProSubdeptsGroup" resultMap="QuartzProSubdeptsGroupResult">
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasSignetServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasSignetServiceImpl.java
index a1ff2869..4d5789da 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasSignetServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasSignetServiceImpl.java
@@ -46,7 +46,7 @@ public class BasSignetServiceImpl implements IBasSignetService
     public List<BasSignet> selectBasSignetList(BasSignet basSignet)
     {
         if(Objects.isNull(basSignet.getProjectId())){
-            basSignet.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //basSignet.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             basSignet.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return basSignetMapper.selectBasSignetList(basSignet);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasTemplateServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasTemplateServiceImpl.java
index edaad8df..a640d5f5 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasTemplateServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BasTemplateServiceImpl.java
@@ -43,7 +43,7 @@ public class BasTemplateServiceImpl implements IBasTemplateService
     @Override
     public List<BasTemplate> selectBasTemplateList(BasTemplate basTemplate)
     {
-        basTemplate.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+        //basTemplate.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
         basTemplate.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         return basTemplateMapper.selectBasTemplateList(basTemplate);
     }
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamInfoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamInfoServiceImpl.java
index fd3831a3..82a2cb56 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamInfoServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamInfoServiceImpl.java
@@ -48,8 +48,10 @@ public class BusExamInfoServiceImpl implements IBusExamInfoService
     @Override
     public List<BusExamInfo> selectBusExamInfoList(BusExamInfo busExamInfo)
     {
-        busExamInfo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        busExamInfo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(busExamInfo.getProjectId()==null){
+            //busExamInfo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            busExamInfo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return busExamInfoMapper.selectBusExamInfoList(busExamInfo);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java
index b8aa276e..88fd84ef 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamQuestionServiceImpl.java
@@ -53,8 +53,10 @@ public class BusExamQuestionServiceImpl implements IBusExamQuestionService
     @Override
     public List<BusExamQuestion> selectBusExamQuestionList(BusExamQuestion busExamQuestion)
     {
-        busExamQuestion.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        busExamQuestion.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(busExamQuestion.getProjectId()==null){
+            //busExamQuestion.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            busExamQuestion.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return busExamQuestionMapper.selectBusExamQuestionList(busExamQuestion);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java
index 9d90b611..500f9f73 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusExamUserServiceImpl.java
@@ -79,8 +79,10 @@ public class BusExamUserServiceImpl implements IBusExamUserService
     @Override
     public List<BusExamUser> selectBusExamUserList(BusExamUser busExamUser)
     {
-        busExamUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        busExamUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(busExamUser.getProjectId()==null){
+            //busExamUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            busExamUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return busExamUserMapper.selectBusExamUserList(busExamUser);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java
index 250486a1..a8e6d403 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoServiceImpl.java
@@ -64,8 +64,10 @@ public class BusTrainingVideoServiceImpl implements IBusTrainingVideoService
     @Override
     public List<BusTrainingVideo> selectBusTrainingVideoList(BusTrainingVideo busTrainingVideo)
     {
-        busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(busTrainingVideo.getProjectId()==null){
+            //busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return busTrainingVideoMapper.selectBusTrainingVideoList(busTrainingVideo);
     }
 
@@ -77,8 +79,10 @@ public class BusTrainingVideoServiceImpl implements IBusTrainingVideoService
      */
     @Override
     public List<Map<String, Object>> findBusTrainingVideoByLevel(BusTrainingVideo busTrainingVideo){
-        busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(busTrainingVideo.getProjectId()==null){
+            //busTrainingVideo.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            busTrainingVideo.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return busTrainingVideoMapper.findBusTrainingVideoByLevel(busTrainingVideo);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoUserServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoUserServiceImpl.java
index 54d62d24..a92594e3 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoUserServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/BusTrainingVideoUserServiceImpl.java
@@ -68,8 +68,10 @@ public class BusTrainingVideoUserServiceImpl implements IBusTrainingVideoUserSer
     @Override
     public List<BusTrainingVideoUser> selectBusTrainingVideoUserList(BusTrainingVideoUser busTrainingVideoUser)
     {
-        busTrainingVideoUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        busTrainingVideoUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(busTrainingVideoUser.getProjectId()==null){
+            //busTrainingVideoUser.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            busTrainingVideoUser.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return busTrainingVideoUserMapper.selectBusTrainingVideoUserList(busTrainingVideoUser);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectConfigServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectConfigServiceImpl.java
index a17e1da8..172586ee 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectConfigServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectConfigServiceImpl.java
@@ -77,8 +77,10 @@ public class DevAiProjectConfigServiceImpl implements IDevAiProjectConfigService
     @Override
     public List<DevAiProjectConfig> selectDevAiProjectConfigList(DevAiProjectConfig devAiProjectConfig)
     {
-        devAiProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        devAiProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(devAiProjectConfig.getProjectId()==null){
+            //devAiProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devAiProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devAiProjectConfigMapper.selectDevAiProjectConfigList(devAiProjectConfig);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectDataServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectDataServiceImpl.java
index db7b69d5..623283e3 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectDataServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevAiProjectDataServiceImpl.java
@@ -67,7 +67,7 @@ public class DevAiProjectDataServiceImpl implements IDevAiProjectDataService
     public List<DevAiProjectData> selectDevAiProjectDataList(DevAiProjectData devAiProjectData)
     {
         if(devAiProjectData.getProjectId()==null){
-            devAiProjectData.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //devAiProjectData.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             devAiProjectData.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return devAiProjectDataMapper.selectDevAiProjectDataList(devAiProjectData);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigPointServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigPointServiceImpl.java
index a0657050..b5fcf4fb 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigPointServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigPointServiceImpl.java
@@ -43,8 +43,10 @@ public class DevIotConfigPointServiceImpl implements IDevIotConfigPointService
     @Override
     public List<DevIotConfigPoint> selectDevIotConfigPointList(DevIotConfigPoint devIotConfigPoint)
     {
-        devIotConfigPoint.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        devIotConfigPoint.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(devIotConfigPoint.getProjectId()==null){
+            //devIotConfigPoint.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devIotConfigPoint.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devIotConfigPointMapper.selectDevIotConfigPointList(devIotConfigPoint);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigServiceImpl.java
index f8c27c23..cd941a71 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotConfigServiceImpl.java
@@ -46,7 +46,7 @@ public class DevIotConfigServiceImpl implements IDevIotConfigService
     public List<DevIotConfig> selectDevIotConfigList(DevIotConfig devIotConfig)
     {
         if(devIotConfig.getProjectId()==null){
-            devIotConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //devIotConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             devIotConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return devIotConfigMapper.selectDevIotConfigList(devIotConfig);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotDatasServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotDatasServiceImpl.java
index f6a32bab..7783c2f2 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotDatasServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotDatasServiceImpl.java
@@ -43,7 +43,7 @@ public class DevIotDatasServiceImpl implements IDevIotDatasService
     public List<DevIotDatas> selectDevIotDatasList(DevIotDatas devIotDatas)
     {
         if(devIotDatas.getProjectId()==null){
-            devIotDatas.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //devIotDatas.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             devIotDatas.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return devIotDatasMapper.selectDevIotDatasList(devIotDatas);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotWarningServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotWarningServiceImpl.java
index 6f05befb..4180ce7f 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotWarningServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevIotWarningServiceImpl.java
@@ -51,7 +51,7 @@ public class DevIotWarningServiceImpl implements IDevIotWarningService
     public List<DevIotWarning> selectDevIotWarningList(DevIotWarning devIotWarning)
     {
         if(devIotWarning.getProjectId()==null){
-            devIotWarning.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //devIotWarning.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             devIotWarning.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return devIotWarningMapper.selectDevIotWarningList(devIotWarning);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java
index a44fe768..ea799922 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataCollideServiceImpl.java
@@ -2,6 +2,7 @@ package com.yanzhu.manage.service.impl;
 
 import com.yanzhu.common.core.utils.DateUtils;
 import com.yanzhu.common.core.utils.StringUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.device.domain.DevTowerDataCollide;
 import com.yanzhu.device.domain.DevTowerDataCollideDetail;
 import com.yanzhu.device.mapper.DevTowerDataCollideMapper;
@@ -45,6 +46,10 @@ public class DevTowerDataCollideServiceImpl implements IDevTowerDataCollideServi
     @Override
     public List<DevTowerDataCollide> selectDevTowerDataCollideList(DevTowerDataCollide devTowerDataCollide)
     {
+        if(devTowerDataCollide.getProjectId()==null){
+            //devTowerDataCollide.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devTowerDataCollide.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devTowerDataCollideMapper.selectDevTowerDataCollideList(devTowerDataCollide);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java
index 7f91f42e..2777519e 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLimitServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yanzhu.manage.service.impl;
 
 import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.device.domain.DevTowerDataLimit;
 import com.yanzhu.device.mapper.DevTowerDataLimitMapper;
 import com.yanzhu.manage.service.IDevTowerDataLimitService;
@@ -41,6 +42,10 @@ public class DevTowerDataLimitServiceImpl implements IDevTowerDataLimitService
     @Override
     public List<DevTowerDataLimit> selectDevTowerDataLimitList(DevTowerDataLimit devTowerDataLimit)
     {
+        if(devTowerDataLimit.getProjectId()==null){
+            //devTowerDataLimit.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devTowerDataLimit.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devTowerDataLimitMapper.selectDevTowerDataLimitList(devTowerDataLimit);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java
index b4f53314..0be0ebe8 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataLocalServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yanzhu.manage.service.impl;
 
 import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.device.domain.DevTowerDataLocal;
 import com.yanzhu.device.mapper.DevTowerDataLocalMapper;
 import com.yanzhu.manage.service.IDevTowerDataLocalService;
@@ -41,6 +42,10 @@ public class DevTowerDataLocalServiceImpl implements IDevTowerDataLocalService
     @Override
     public List<DevTowerDataLocal> selectDevTowerDataLocalList(DevTowerDataLocal devTowerDataLocal)
     {
+        if(devTowerDataLocal.getProjectId()==null){
+            //devTowerDataLocal.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devTowerDataLocal.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devTowerDataLocalMapper.selectDevTowerDataLocalList(devTowerDataLocal);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java
index 1471412a..d10518de 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRoundServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yanzhu.manage.service.impl;
 
 import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.device.domain.DevTowerDataRound;
 import com.yanzhu.device.mapper.DevTowerDataRoundMapper;
 import com.yanzhu.manage.service.IDevTowerDataRoundService;
@@ -41,6 +42,10 @@ public class DevTowerDataRoundServiceImpl implements IDevTowerDataRoundService
     @Override
     public List<DevTowerDataRound> selectDevTowerDataRoundList(DevTowerDataRound devTowerDataRound)
     {
+        if(devTowerDataRound.getProjectId()==null){
+            //devTowerDataRound.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devTowerDataRound.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devTowerDataRoundMapper.selectDevTowerDataRoundList(devTowerDataRound);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java
index cb95a66e..49987330 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataRunServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yanzhu.manage.service.impl;
 
 import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.device.domain.DevTowerDataRound;
 import com.yanzhu.device.domain.DevTowerDataRun;
 import com.yanzhu.device.mapper.DevTowerDataCollideMapper;
@@ -55,6 +56,10 @@ public class DevTowerDataRunServiceImpl implements IDevTowerDataRunService
     @Override
     public List<DevTowerDataRun> selectDevTowerDataRunList(DevTowerDataRun devTowerDataRun)
     {
+        if(devTowerDataRun.getProjectId()==null){
+            //devTowerDataRun.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devTowerDataRun.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devTowerDataRunMapper.selectDevTowerDataRunList(devTowerDataRun);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java
index be5e353b..47de75ab 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerDataWarningServiceImpl.java
@@ -1,6 +1,7 @@
 package com.yanzhu.manage.service.impl;
 
 import com.yanzhu.common.core.utils.DateUtils;
+import com.yanzhu.common.security.utils.SecurityUtils;
 import com.yanzhu.device.domain.DevTowerDataWarning;
 import com.yanzhu.device.mapper.DevTowerDataWarningMapper;
 import com.yanzhu.manage.service.IDevTowerDataWarningService;
@@ -41,6 +42,10 @@ public class DevTowerDataWarningServiceImpl implements IDevTowerDataWarningServi
     @Override
     public List<DevTowerDataWarning> selectDevTowerDataWarningList(DevTowerDataWarning devTowerDataWarning)
     {
+        if(devTowerDataWarning.getProjectId()==null){
+            //devTowerDataWarning.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devTowerDataWarning.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devTowerDataWarningMapper.selectDevTowerDataWarningList(devTowerDataWarning);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java
index 1f2ba9c4..968a71c1 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/DevTowerProjectConfigServiceImpl.java
@@ -82,6 +82,10 @@ public class DevTowerProjectConfigServiceImpl implements IDevTowerProjectConfigS
     @Override
     public List<DevTowerProjectConfig> selectDevTowerProjectConfigList(DevTowerProjectConfig devTowerProjectConfig)
     {
+        if(devTowerProjectConfig.getProjectId()==null){
+            //devTowerProjectConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            devTowerProjectConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         return devTowerProjectConfigMapper.selectDevTowerProjectConfigList(devTowerProjectConfig);
     }
 
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java
index 7d18fc15..f6bf02ef 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsGroupServiceImpl.java
@@ -84,7 +84,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
     public List<ProProjectInfoSubdeptsGroup> selectProProjectInfoSubdeptsGroupList(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup)
     {
         if(proProjectInfoSubdeptsGroup.getProjectId()==null){
-            proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             proProjectInfoSubdeptsGroup.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return proProjectInfoSubdeptsGroupMapper.selectProProjectInfoSubdeptsGroupList(proProjectInfoSubdeptsGroup);
@@ -100,7 +100,7 @@ public class ProProjectInfoSubdeptsGroupServiceImpl implements IProProjectInfoSu
     public List<Map<String, Object>> findProProjectInfoSubdeptsGroupCount(ProProjectInfoSubdeptsGroup proProjectInfoSubdeptsGroup)
     {
         if(proProjectInfoSubdeptsGroup.getProjectId()==null){
-            proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //proProjectInfoSubdeptsGroup.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             proProjectInfoSubdeptsGroup.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return proProjectInfoSubdeptsGroupMapper.findProProjectInfoSubdeptsGroupCount(proProjectInfoSubdeptsGroup);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
index 09908305..1e3aed79 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/ProProjectInfoSubdeptsServiceImpl.java
@@ -98,7 +98,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
     public List<ProProjectInfoSubdepts> selectProProjectInfoSubdeptsList(ProProjectInfoSubdepts proProjectInfoSubdepts)
     {
         if(proProjectInfoSubdepts.getProjectId()==null){
-            proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             proProjectInfoSubdepts.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return proProjectInfoSubdeptsMapper.selectProProjectInfoSubdeptsList(proProjectInfoSubdepts);
@@ -114,7 +114,7 @@ public class ProProjectInfoSubdeptsServiceImpl implements IProProjectInfoSubdept
     public List<Map<String, Object>> findProProjectInfoSubdeptsCount(ProProjectInfoSubdepts proProjectInfoSubdepts)
     {
         if(proProjectInfoSubdepts.getProjectId()==null){
-            proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            //proProjectInfoSubdepts.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
             proProjectInfoSubdepts.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
         }
         return proProjectInfoSubdeptsMapper.findProProjectInfoSubdeptsCount(proProjectInfoSubdepts);
diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/WxMenuConfigServiceImpl.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/WxMenuConfigServiceImpl.java
index 5156b0d3..ec15e19a 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/WxMenuConfigServiceImpl.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/service/impl/WxMenuConfigServiceImpl.java
@@ -54,8 +54,10 @@ public class WxMenuConfigServiceImpl implements IWxMenuConfigService
     @Override
     public List<WxMenuConfig> selectWxMenuConfigList(WxMenuConfig wxMenuConfig)
     {
-        wxMenuConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
-        wxMenuConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        if(wxMenuConfig.getProjectId()==null){
+            //wxMenuConfig.setActiveComId(SecurityUtils.getLoginUser().getSysUser().getActiveComId());
+            wxMenuConfig.setActiveProjectId(SecurityUtils.getLoginUser().getSysUser().getActiveProjectId());
+        }
         List<WxMenuConfig> list = wxMenuConfigMapper.selectWxMenuConfigList(wxMenuConfig);
         if(StringUtils.isNotEmpty(list)){
             List<Long> smcIds = list.stream().map(WxMenuConfig::getId).collect(Collectors.toList());
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
index 5fedbc51..d98cc2da 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataCollide/index.vue
@@ -298,8 +298,8 @@ export default {
         this.dict = this.useDict('sys_common_isdel');
         this.userStore = useUserStore()
         this.isAdmin = this.userStore.isAdmin;
-        this.queryParams.projectId = this.userStore.currentPrjId;
-        this.queryParams.comId = this.userStore.currentComId;
+        //this.queryParams.projectId = this.userStore.currentPrjId;
+        //this.queryParams.comId = this.userStore.currentComId;
         this.currentPrjId = this.userStore.currentPrjId;
         this.queryProjectChange();
         this.getList();
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
index 67fbae7b..36a68386 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataLimit/index.vue
@@ -299,8 +299,8 @@ export default {
         this.dict = this.useDict('sys_common_isdel');
         this.userStore = useUserStore()
         this.isAdmin = this.userStore.isAdmin;
-        this.queryParams.projectId = this.userStore.currentPrjId;
-        this.queryParams.comId = this.userStore.currentComId;
+        //this.queryParams.projectId = this.userStore.currentPrjId;
+        //this.queryParams.comId = this.userStore.currentComId;
         this.currentPrjId = this.userStore.currentPrjId;
         this.queryProjectChange();
         this.getList();
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
index 29153925..98d39bf3 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRound/index.vue
@@ -274,8 +274,8 @@ export default {
         this.dict = this.useDict('sys_common_isdel', 'device_tower_warning');
         this.userStore = useUserStore()
         this.isAdmin = this.userStore.isAdmin;
-        this.queryParams.projectId = this.userStore.currentPrjId;
-        this.queryParams.comId = this.userStore.currentComId;
+        //this.queryParams.projectId = this.userStore.currentPrjId;
+        //this.queryParams.comId = this.userStore.currentComId;
         this.currentPrjId = this.userStore.currentPrjId;
         this.queryProjectChange();
         this.getList();
diff --git a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
index ce35c7f0..d29e3c04 100644
--- a/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerDataRun/index.vue
@@ -285,8 +285,8 @@ export default {
         this.dict = this.useDict('sys_common_isdel', 'device_tower_warning', 'device_braking_status', 'device_rotation_state');
         this.userStore = useUserStore()
         this.isAdmin = this.userStore.isAdmin;
-        this.queryParams.projectId = this.userStore.currentPrjId;
-        this.queryParams.comId = this.userStore.currentComId;
+        //this.queryParams.projectId = this.userStore.currentPrjId;
+        //this.queryParams.comId = this.userStore.currentComId;
         this.queryProjectChange();
         this.currentPrjId = this.userStore.currentPrjId;
         this.getList();
diff --git a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
index d1949701..49e385e4 100644
--- a/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
+++ b/yanzhu-ui-vue3/src/views/device/towerProjectConfig/index.vue
@@ -429,9 +429,9 @@ export default {
     );
     this.userStore = useUserStore();
     this.isAdmin = this.userStore.isAdmin;
-    this.queryParams.projectId = this.userStore.currentPrjId;
-    this.queryParams.comId = this.userStore.currentComId;
-    this.queryParams.deptId = "";
+    //this.queryParams.projectId = this.userStore.currentPrjId;
+    //this.queryParams.comId = this.userStore.currentComId;
+    //this.queryParams.deptId = "";
     this.queryProjectChange();
     this.currentPrjId = this.userStore.currentPrjId;
     this.getList();