From 2cb3be80d7507c4bc77d2da993eeed93ed969e1f Mon Sep 17 00:00:00 2001
From: Xusan <1105644308@QQ.COM>
Date: Tue, 14 May 2024 15:12:06 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=84=E7=BB=87=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9,=E5=8D=95=E4=BD=8D=E6=9F=A5=E8=AF=A2=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9,=E7=BB=84=E7=BB=87=E7=BD=AE=E9=A1=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0,=20=E5=8D=95=E4=BD=8D=E7=BD=AE=E9=A1=B6=E6=B7=BB?=
 =?UTF-8?q?=E5=8A=A0,=20=E8=A1=8C=E6=94=BF=E5=8C=BA=E5=88=92=E6=9F=A5?=
 =?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/whdc/mapper/UnitDictMapper.java          | 7 +++++--
 src/main/java/com/whdc/service/IUnitDictService.java       | 1 +
 .../com/whdc/service/impl/OrganizationServiceImpl.java     | 2 +-
 .../java/com/whdc/service/impl/UnitDictServiceImpl.java    | 4 ++++
 src/main/resources/mapper/UnitDictMapper.xml               | 4 +++-
 5 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/whdc/mapper/UnitDictMapper.java b/src/main/java/com/whdc/mapper/UnitDictMapper.java
index 8f50759..61366cf 100644
--- a/src/main/java/com/whdc/mapper/UnitDictMapper.java
+++ b/src/main/java/com/whdc/mapper/UnitDictMapper.java
@@ -2,6 +2,7 @@ package com.whdc.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.whdc.model.entity.Organization;
 import org.apache.ibatis.annotations.Param;
 import com.whdc.model.entity.UnitDict;
 
@@ -16,5 +17,7 @@ public interface UnitDictMapper  extends BaseMapper<UnitDict> {
     IPage<UnitDict> page(@Param("page") IPage<UnitDict> page, @Param("dto") UnitDict dto);
 
     List<UnitDict> find(@Param("dto") UnitDict dto);
-    
-    }
\ No newline at end of file
+
+    List<UnitDict> findByUserId(@Param("userId") String userId);
+
+}
\ No newline at end of file
diff --git a/src/main/java/com/whdc/service/IUnitDictService.java b/src/main/java/com/whdc/service/IUnitDictService.java
index 05ebae1..c57e004 100644
--- a/src/main/java/com/whdc/service/IUnitDictService.java
+++ b/src/main/java/com/whdc/service/IUnitDictService.java
@@ -20,5 +20,6 @@ public interface IUnitDictService extends IService<UnitDict> {
 
     // 获取所有规则
     List<UnitDict> find(UnitDict dto);
+    List<UnitDict> findByUserId(String userId);
 
 }
\ No newline at end of file
diff --git a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java
index 70b073b..494d664 100644
--- a/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/OrganizationServiceImpl.java
@@ -48,7 +48,7 @@ public class OrganizationServiceImpl extends ServiceImpl<OrganizationMapper, Org
     public List<Organization> findByUserId(String userId) {
         List<Organization> organizations = baseMapper.findByUserId(userId);
 
-        List<UnitDict> list = unitDictService.list();
+        List<UnitDict> list = unitDictService.findByUserId(userId);
 
         List<AdcdTree> tree = adinfoService.tree(null, null);
         Map<Integer, List<UnitDict>> collect = list.stream().collect(Collectors.groupingBy(UnitDict::getOId));
diff --git a/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java
index 03e1c4f..7c402de 100644
--- a/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java
+++ b/src/main/java/com/whdc/service/impl/UnitDictServiceImpl.java
@@ -32,6 +32,10 @@ public class UnitDictServiceImpl extends ServiceImpl<UnitDictMapper, UnitDict> i
         return baseMapper.find(dto);
     }
 
+    @Override
+    public List<UnitDict> findByUserId(String userId) {
+        return baseMapper.findByUserId(userId);
+    }
 
 
 }
diff --git a/src/main/resources/mapper/UnitDictMapper.xml b/src/main/resources/mapper/UnitDictMapper.xml
index 8790541..284066e 100644
--- a/src/main/resources/mapper/UnitDictMapper.xml
+++ b/src/main/resources/mapper/UnitDictMapper.xml
@@ -7,7 +7,9 @@
     </select>
 
 
-    <select id="find" resultType="com.whdc.model.entity.UnitDict">
+    <select id="find" resultType="com.whdc.model.entity.UnitDict"></select>
+
+    <select id="findByUserId" resultType="com.whdc.model.entity.UnitDict">
         SELECT
         UD.*,
         F.SORT FSORT