From 7399b45a3a689c6c1156588b700b91b483058516 Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Fri, 14 Mar 2025 15:43:45 +0800
Subject: [PATCH] =?UTF-8?q?feat(system):=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E6=9F=A5=E8=AF=A2=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改 DeptMapper 接口，将 selectCompany 方法的 type 参数
---
 .../yudao/module/system/dal/mysql/dept/DeptMapper.java       | 2 +-
 .../yudao/module/system/service/dept/DeptServiceImpl.java    | 2 +-
 .../src/main/resources/mapper/dept/DeptMapper.xml            | 5 ++++-
 3 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
index 595ed075..33d8352b 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/dal/mysql/dept/DeptMapper.java
@@ -63,5 +63,5 @@ public interface DeptMapper extends BaseMapperX<DeptDO> {
     }
 
     List<DeptDO> selectCompany(@Param("flag") String flag,
-                               @Param("type") String type);
+                               @Param("type") List<String> type);
 }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index 7dedab46..3bdb1e0f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -373,7 +373,7 @@ public class DeptServiceImpl implements DeptService {
         }
 
         // 根据所在部门信息获取 所在公司信息
-        List<DeptDO> companyDeptList = deptMapper.selectCompany(deptDo.getFlag(), DeptTypeEnum.COMPANY.getValue());
+        List<DeptDO> companyDeptList = deptMapper.selectCompany(deptDo.getFlag(), Arrays.asList(DeptTypeEnum.HEAD_COMPANY.getValue(), DeptTypeEnum.COMPANY.getValue()));
 
         if (CollectionUtil.isEmpty(companyDeptList)) {
             return new DeptDO();
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dept/DeptMapper.xml b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dept/DeptMapper.xml
index 4ed0e5c3..b58a08e6 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dept/DeptMapper.xml
+++ b/yudao-module-system/yudao-module-system-biz/src/main/resources/mapper/dept/DeptMapper.xml
@@ -16,7 +16,10 @@
             system_dept
         WHERE
             #{flag} LIKE CONCAT('%', flag, '%')
-            AND type = #{type}
+            AND type IN
+            <foreach collection="type" item="item" open="(" separator="," close=")">
+                #{item}
+            </foreach>
             AND deleted = 0
     </select>
 </mapper>
\ No newline at end of file