From 0d3ffc6fe34caa38f3a72603105993e72bbeda50 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Mon, 15 Apr 2024 11:04:32 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E8=81=94=E8=8A=82=E7=82=B9=20?=
 =?UTF-8?q?=E5=8A=A0=E4=B8=8A=E9=83=A8=E9=97=A8=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../zdxt/code/service/impl/LinkageDictServiceImpl.java    | 2 ++
 .../src/main/resources/mapper/LinkageDictMapper.xml       | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LinkageDictServiceImpl.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LinkageDictServiceImpl.java
index 3e40874a..8a3c5aac 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LinkageDictServiceImpl.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/impl/LinkageDictServiceImpl.java
@@ -58,6 +58,7 @@ public class LinkageDictServiceImpl implements ILinkageDictService
      * @return 联动字典
      */
     @Override
+    @DataScope
     public List<LinkageDict> selectLinkageDictList(LinkageDict linkageDict)
     {
         return linkageDictMapper.selectLinkageDictList(linkageDict);
@@ -74,6 +75,7 @@ public class LinkageDictServiceImpl implements ILinkageDictService
     {
         UserBean user = userApi.getCurrentUser();
         linkageDict.setId(IdUtil.simpleUUID());
+        linkageDict.setDeptId(user.getDeptId());
         linkageDict.setCreateBy(user.getUserName());
         linkageDict.setCreateTime(DateUtils.getNowDate());
         return linkageDictMapper.insertLinkageDict(linkageDict);
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml
index 1dca6e41..7a038643 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml
@@ -14,6 +14,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <result property="status"    column="status"    />
         <result property="domain"    column="domain"    />
         <result property="dept"    column="dept"    />
+        <result property="deptId"    column="dept_id"    />
         <result property="demand"    column="demand"    />
         <result property="basis"    column="basis"    />
         <result property="creator"    column="creator"    />
@@ -23,7 +24,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
     </resultMap>
 
     <sql id="selectLinkageDictVo">
-        select id, title, `value`, parent_id, `desc`, srot, `status`, `domain`, dept, demand, basis, creator, create_time, updator, update_time from linkage_dict
+        select id, title, `value`, parent_id, `desc`, srot, `status`, `domain`, dept, dept_id, demand, basis, creator, create_time, updator, update_time from linkage_dict
     </sql>
 
     <select id="selectLinkageDictList" parameterType="LinkageDict" resultMap="LinkageDictResult">
@@ -37,6 +38,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null "> and status = #{status}</if>
             <if test="creator != null  and creator != ''"> and creator = #{creator}</if>
             <if test="updator != null  and updator != ''"> and updator = #{updator}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
         </where>
     </select>
     
@@ -62,6 +65,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null ">`status`,</if>
             <if test="domain != null and domain != ''">`domain`,</if>
             <if test="dept != null and dept != ''">`dept`,</if>
+            <if test="deptId != null and deptId != ''">`dept_id`,</if>
             <if test="demand != null  and demand != ''">`demand`,</if>
             <if test="basis != null and basis != ''">`basis`,</if>
             <if test="creator != null  and creator != ''">creator,</if>
@@ -79,6 +83,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null ">#{status},</if>
             <if test="domain != null and domain != ''">#{domain},</if>
             <if test="dept != null and dept != ''">#{dept},</if>
+            <if test="deptId != null and deptId != ''">#{deptId},</if>
             <if test="demand != null and demand != ''">#{demand},</if>
             <if test="basis != null and basis != ''">#{basis},</if>
             <if test="creator != null  and creator != ''">#{creator},</if>
@@ -99,6 +104,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="status != null ">`status` = #{status},</if>
             <if test="domain != null and domain != ''">`domain` = #{domain},</if>
             <if test="dept != null and dept != ''">`dept` = #{dept},</if>
+            <if test="deptId != null and deptId != ''">`dept_id` = #{deptId},</if>
             <if test="demand != null and demand != ''">`demand` = #{demand},</if>
             <if test="basis != null and basis != ''">`basis` = #{basis},</if>
             <if test="creator != null  and creator != ''">creator = #{creator},</if>