From 15bd77a97df70b4c083282ab7ab404c6e12404ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=B0=91=E5=B9=B4=E6=A2=A6=E4=B8=8E=E7=A0=96?=
 <2847127106@qq.com>
Date: Sun, 22 Sep 2024 09:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E6=88=90=E7=A7=9F=E6=88=B7=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=B8=8E=E7=94=A8=E6=88=B7=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java  | 4 ++--
 .../java/com/muyu/system/controller/SysDeptController.java    | 3 ++-
 .../java/com/muyu/system/controller/SysUserController.java    | 2 ++
 .../src/main/resources/mapper/system/SysUserMapper.xml        | 3 +++
 4 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java
index 4c79417..ec72e6e 100644
--- a/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java
+++ b/cloud-common/cloud-common-saas/src/main/java/com/muyu/cloud/common/saas/interceptor/WebMvcSaaSConfig.java
@@ -12,13 +12,13 @@ public class WebMvcSaaSConfig implements WebMvcConfigurer {
     /**
      * 不需要拦截的地址
      */
-    public static final String[] excludeUrls = {"/login", "/logout", "/refresh"};
+    public static final String[] EXCLUDE_URLS = {"/dept/**", "/login", "/logout", "/refresh"};
 
     @Override
     public void addInterceptors (InterceptorRegistry registry) {
         registry.addInterceptor(getHeaderInterceptor())
                 .addPathPatterns("/**")
-                .excludePathPatterns(excludeUrls)
+                .excludePathPatterns(EXCLUDE_URLS)
                 .order(-10);
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
index 49af06c..3818d11 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysDeptController.java
@@ -72,7 +72,8 @@ public class SysDeptController extends BaseController {
             return error("新增部门'" + dept.getDeptName() + "'失败，部门名称已存在");
         }
         dept.setCreateBy(SecurityUtils.getUsername());
-        dept.setFirmCode(SecurityUtils.getSaasKey());
+        SysDept sysDept = deptService.selectDeptById(dept.getParentId());
+        dept.setFirmCode(sysDept.getFirmCode());
         return toAjax(deptService.insertDept(dept));
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
index abfe627..14c5dd7 100644
--- a/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
+++ b/cloud-modules/cloud-modules-system/src/main/java/com/muyu/system/controller/SysUserController.java
@@ -63,6 +63,7 @@ public class SysUserController extends BaseController {
     @GetMapping("/list")
     public Result<TableDataInfo<SysUser>> list (SysUser user) {
         startPage();
+        user.setFirmCode(SecurityUtils.getSaasKey());
         List<SysUser> list = userService.selectUserList(user);
         return getDataTable(list);
     }
@@ -197,6 +198,7 @@ public class SysUserController extends BaseController {
         }
         user.setCreateBy(SecurityUtils.getUsername());
         user.setPassword(SecurityUtils.encryptPassword(user.getPassword()));
+        user.setFirmCode(SecurityUtils.getSaasKey());
         return toAjax(userService.insertUser(user));
     }
 
diff --git a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml
index 9eb51ca..a7e4061 100644
--- a/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml
+++ b/cloud-modules/cloud-modules-system/src/main/resources/mapper/system/SysUserMapper.xml
@@ -93,6 +93,9 @@
         <if test="userId != null and userId != 0">
             AND u.user_id = #{userId}
         </if>
+        <if test="firmCode != null and firmCode != '' and firmCode != 'FIRM'">
+            AND u.firm_code like concat('%', #{firmCode}, '%')
+        </if>
         <if test="userName != null and userName != ''">
             AND u.user_name like concat('%', #{userName}, '%')
         </if>