From 9d96e8b249111e4d6afd3877a79356a8e7aad808 Mon Sep 17 00:00:00 2001
From: GUO <1923636941@qq.com>
Date: Wed, 5 Jun 2024 22:03:32 +0800
Subject: [PATCH] =?UTF-8?q?moduleType=E6=9F=A5=E8=AF=A2=E6=B7=BB=E5=8A=A0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml     | 3 +++
 .../modules/basicdata/service/impl/SystemUserServiceImpl.java  | 1 +
 2 files changed, 4 insertions(+)

diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
index e52cf6fd0..4769fae9a 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/BaseModuleMapper.xml
@@ -41,6 +41,9 @@
                               INNER JOIN base_menu t3 ON a1.menu_id=t3.menu_id
                               INNER JOIN base_module t4 ON t3.module_id=t4.module_id
         WHERE t1.project_sn=#{projectSn} AND t.user_id=#{userId} and t3.status=1 and t4.style_type=#{styleType}
+        <if test="moduleType != null and moduleType != ''">
+            and t4.module_type = #{moduleType}
+        </if>
         ORDER BY t4.module_type,t4.label_sort_num,t4.label_name,t4.module_id
 
     </select>
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
index 5eba321a0..b7ecf8f98 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/SystemUserServiceImpl.java
@@ -945,6 +945,7 @@ public class SystemUserServiceImpl extends ServiceImpl<SystemUserMapper, SystemU
         } else if (accountType == 6) {
             param.put("projectSn", sn);
             param.put("userId", userId);
+            param.put("moduleType", moduleType);
             moduleList = baseModuleMapper.getProjectUserModuleList(param);
             menuList = baseMenuService.getProjectUserMenuList(param);
             actionList = baseActionMapper.getProjectUserActionList(param);