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 list = linkageDictService.selectLinkageDictList(linkageDict); return list; } + @GetMapping("/listByParentId") + @ResponseBody + public List listByParentId(LinkageDict linkageDict) + { + List list = linkageDictService.selectLinkageDictByParentId(linkageDict); + return list; + } /** * 查询联动字典列表 @@ -83,6 +90,22 @@ public class AppLinkageDictController extends BaseController return obj; } + @PostMapping("/selectLinkageDictByValue") + @ResponseBody + public List selectLinkageDictByValue(@RequestBody LinkageDict linkageDict) + { + List objs = linkageDictService.selectLinkageDictByValue(linkageDict); + return objs; + } + + @PostMapping("/selectLinkageDictByValueNoAuth") + @ResponseBody + public List selectLinkageDictByValueNoAuth(@RequestBody LinkageDict linkageDict) + { + List 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 selectLinkageDictByValue(LinkageDict linkageDict); /** * 查询联动字典列表 @@ -29,6 +30,7 @@ public interface LinkageDictMapper * @return 联动字典集合 */ public List selectLinkageDictList(LinkageDict linkageDict); + public List 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 selectLinkageDictByValue(LinkageDict linkageDict); + public List selectLinkageDictByValueNoAuth(LinkageDict linkageDict); /** * 查询联动字典列表 @@ -29,6 +31,7 @@ public interface ILinkageDictService * @return 联动字典集合 */ public List selectLinkageDictList(LinkageDict linkageDict); + public List 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 selectLinkageDictByValue(LinkageDict linkageDict) + { + return linkageDictMapper.selectLinkageDictByValue(linkageDict); + } + @Override + public List selectLinkageDictByValueNoAuth(LinkageDict linkageDict) + { + return linkageDictMapper.selectLinkageDictByValue(linkageDict); + } /** * 查询联动字典列表 @@ -64,6 +75,13 @@ public class LinkageDictServiceImpl implements ILinkageDictService return linkageDictMapper.selectLinkageDictList(linkageDict); } + @Override + @DataScope + public List 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 + + + + insert into linkage_dict