联动字典加入权限

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;
     }

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;
+    }
+
     /**
      * 新增联动字典
      */

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);
 
     /**
      * 新增联动字典

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);
 
     /**
      * 新增联动字典

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);
+    }
+
     /**
      * 新增联动字典
      * 

lib/EmergencyService/zdxtLawEnforcementCodeService/src/main/resources/mapper/LinkageDictMapper.xml

@@ -44,6 +44,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </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,
         (select title from linkage_dict where id = ld.parent_id) parent_name
@@ -56,6 +65,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         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
         <trim prefix="(" suffix=")" suffixOverrides=",">