From a1cba5927795e3a0f7b75e9f5c814119a4319ec0 Mon Sep 17 00:00:00 2001
From: kylin L <452061493@qq.com>
Date: Fri, 21 Jun 2024 16:59:04 +0800
Subject: [PATCH] =?UTF-8?q?=E8=81=94=E5=8A=A8=E5=AD=97=E5=85=B8=E5=8A=A0?=
 =?UTF-8?q?=E5=85=A5=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../main/java/com/zdxt/common/BaseDomain.java |  8 +++++++
 .../controller/AppLinkageDictController.java  | 23 +++++++++++++++++++
 .../zdxt/code/mapper/LinkageDictMapper.java   |  2 ++
 .../code/service/ILinkageDictService.java     |  3 +++
 .../service/impl/LinkageDictServiceImpl.java  | 18 +++++++++++++++
 .../resources/mapper/LinkageDictMapper.xml    | 17 ++++++++++++++
 6 files changed, 71 insertions(+)

diff --git a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java
index 96c7576a..89d84e12 100644
--- a/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java
+++ b/lib/EmergencyBaseLib/EmergencyCommon/src/main/java/com/zdxt/common/BaseDomain.java
@@ -69,6 +69,14 @@ public abstract class BaseDomain implements Serializable {
      */
     private String dataScopeId;
 
+    public String getDataScopeId() {
+        return dataScopeId;
+    }
+
+    public void setDataScopeId(String dataScopeId) {
+        this.dataScopeId = dataScopeId;
+    }
+
     public String getKeyword() {
         return keyword;
     }
diff --git a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppLinkageDictController.java b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppLinkageDictController.java
index f4acbfac..2b811551 100755
--- a/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppLinkageDictController.java
+++ b/lib/EmergencyService/zdxtEmergencyAppService/src/main/java/com/zdxt/app/controller/AppLinkageDictController.java
@@ -58,6 +58,13 @@ public class AppLinkageDictController extends BaseController
         List<LinkageDict> list = linkageDictService.selectLinkageDictList(linkageDict);
         return list;
     }
+    @GetMapping("/listByParentId")
+    @ResponseBody
+    public List<LinkageDict> listByParentId(LinkageDict linkageDict)
+    {
+        List<LinkageDict> list = linkageDictService.selectLinkageDictByParentId(linkageDict);
+        return list;
+    }
 
     /**
      * 查询联动字典列表
@@ -83,6 +90,22 @@ public class AppLinkageDictController extends BaseController
         return obj;
     }
 
+    @PostMapping("/selectLinkageDictByValue")
+    @ResponseBody
+    public List<LinkageDict> selectLinkageDictByValue(@RequestBody LinkageDict linkageDict)
+    {
+        List<LinkageDict> objs = linkageDictService.selectLinkageDictByValue(linkageDict);
+        return objs;
+    }
+
+    @PostMapping("/selectLinkageDictByValueNoAuth")
+    @ResponseBody
+    public List<LinkageDict> selectLinkageDictByValueNoAuth(@RequestBody LinkageDict linkageDict)
+    {
+        List<LinkageDict> objs = linkageDictService.selectLinkageDictByValueNoAuth(linkageDict);
+        return objs;
+    }
+
     /**
      * 新增联动字典
      */
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LinkageDictMapper.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LinkageDictMapper.java
index 3b2a35ac..cad4bd2d 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LinkageDictMapper.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/mapper/LinkageDictMapper.java
@@ -21,6 +21,7 @@ public interface LinkageDictMapper
      */
     public LinkageDict selectLinkageDictById(String id);
     public LinkageDict selectLinkageDictByValueAndParentId(@Param("value") String value, @Param("parentId") String parentId);
+    public List<LinkageDict> selectLinkageDictByValue(LinkageDict linkageDict);
 
     /**
      * 查询联动字典列表
@@ -29,6 +30,7 @@ public interface LinkageDictMapper
      * @return 联动字典集合
      */
     public List<LinkageDict> selectLinkageDictList(LinkageDict linkageDict);
+    public List<LinkageDict> selectLinkageDictByParentId(LinkageDict linkageDict);
 
     /**
      * 新增联动字典
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILinkageDictService.java b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILinkageDictService.java
index 635c58bc..a6c18d30 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILinkageDictService.java
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/java/com/zdxt/code/service/ILinkageDictService.java
@@ -21,6 +21,8 @@ public interface ILinkageDictService
      */
     public LinkageDict selectLinkageDictById(String id);
     public LinkageDict selectLinkageDictByValueAndParentId(String value, String parentId);
+    public List<LinkageDict> selectLinkageDictByValue(LinkageDict linkageDict);
+    public List<LinkageDict> selectLinkageDictByValueNoAuth(LinkageDict linkageDict);
 
     /**
      * 查询联动字典列表
@@ -29,6 +31,7 @@ public interface ILinkageDictService
      * @return 联动字典集合
      */
     public List<LinkageDict> selectLinkageDictList(LinkageDict linkageDict);
+    public List<LinkageDict> selectLinkageDictByParentId(LinkageDict linkageDict);
 
     /**
      * 新增联动字典
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 c14f8c07..4ec85c73 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
@@ -50,6 +50,17 @@ public class LinkageDictServiceImpl implements ILinkageDictService
     {
         return linkageDictMapper.selectLinkageDictByValueAndParentId(value, parentId);
     }
+    @Override
+    @DataScope(deptAlias = "t2")
+    public List<LinkageDict> selectLinkageDictByValue(LinkageDict linkageDict)
+    {
+        return linkageDictMapper.selectLinkageDictByValue(linkageDict);
+    }
+    @Override
+    public List<LinkageDict> selectLinkageDictByValueNoAuth(LinkageDict linkageDict)
+    {
+        return linkageDictMapper.selectLinkageDictByValue(linkageDict);
+    }
 
     /**
      * 查询联动字典列表
@@ -64,6 +75,13 @@ public class LinkageDictServiceImpl implements ILinkageDictService
         return linkageDictMapper.selectLinkageDictList(linkageDict);
     }
 
+    @Override
+    @DataScope
+    public List<LinkageDict> selectLinkageDictByParentId(LinkageDict linkageDict)
+    {
+        return linkageDictMapper.selectLinkageDictByParentId(linkageDict);
+    }
+
     /**
      * 新增联动字典
      * 
diff --git a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml
index 2dd5f2d7..f192db07 100755
--- a/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml
+++ b/lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml
@@ -43,6 +43,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             or dept_id is null
         </where>
     </select>
+
+    <select id="selectLinkageDictByParentId" parameterType="LinkageDict" resultMap="LinkageDictResult">
+        <include refid="selectLinkageDictVo"/>
+        <where>
+            <if test="parentId != null  and parentId != ''"> and parent_id = #{parentId}</if>
+            <!-- 数据范围过滤 -->
+            ${params.dataScope}
+        </where>
+    </select>
     
     <select id="selectLinkageDictById" parameterType="String" resultMap="LinkageDictResult">
         select ld.id, ld.title, ld.`value`, ld.parent_id, ld.`desc`, ld.srot, ld.`status`, ld.`domain`, ld.dept, ld.dept_id, ld.demand, ld.basis, ld.creator, ld.create_time, ld.updator, ld.update_time,
@@ -55,6 +64,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectLinkageDictVo"/>
         where `value` = #{value} and parent_id = #{parentId}
     </select>
+
+    <select id="selectLinkageDictByValue" parameterType="LinkageDict" resultMap="LinkageDictResult">
+        select
+            t1.id, t1.title, t1.`value`, t1.parent_id, t1.`desc`, t1.srot, t1.`status`, t1.`domain`, t1.dept, t1.dept_id, t1.demand, t1.basis, t1.creator, t1.create_time, t1.updator, t1.update_time
+        from linkage_dict t1 LEFT JOIN linkage_dict t2 on t2.id = t1.parent_id
+        where t2.`value` = #{value}
+            ${params.dataScope}
+    </select>
         
     <insert id="insertLinkageDict" parameterType="LinkageDict">
         insert into linkage_dict