diff --git a/src/main/java/com/cm/population/controller/route/correct/CorrectRouteController.java b/src/main/java/com/cm/population/controller/route/correct/CorrectRouteController.java index 975633f..d171f31 100644 --- a/src/main/java/com/cm/population/controller/route/correct/CorrectRouteController.java +++ b/src/main/java/com/cm/population/controller/route/correct/CorrectRouteController.java @@ -37,10 +37,11 @@ public class CorrectRouteController extends AbstractController { } @GetMapping("list") - public ModelAndView list(String populationInfoId) { + public ModelAndView list(String populationInfoId, String creator) { PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId); ModelAndView mv = new ModelAndView("correct/list"); mv.addObject("dto", populationInfoDTO); + mv.addObject("creator", creator); return mv; } diff --git a/src/main/java/com/cm/population/controller/route/cult/CultRouteController.java b/src/main/java/com/cm/population/controller/route/cult/CultRouteController.java index f3214bc..6c47961 100644 --- a/src/main/java/com/cm/population/controller/route/cult/CultRouteController.java +++ b/src/main/java/com/cm/population/controller/route/cult/CultRouteController.java @@ -40,10 +40,11 @@ public class CultRouteController extends AbstractController { } @GetMapping("list") - public ModelAndView list(String populationInfoId) { + public ModelAndView list(String populationInfoId, String creator) { PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId); ModelAndView mv = new ModelAndView("cult/list"); mv.addObject("dto", populationInfoDTO); + mv.addObject("creator", creator); return mv; } } \ No newline at end of file diff --git a/src/main/java/com/cm/population/controller/route/dispute/DisputeRouteController.java b/src/main/java/com/cm/population/controller/route/dispute/DisputeRouteController.java index c3bdfa2..f231d02 100644 --- a/src/main/java/com/cm/population/controller/route/dispute/DisputeRouteController.java +++ b/src/main/java/com/cm/population/controller/route/dispute/DisputeRouteController.java @@ -40,10 +40,11 @@ public class DisputeRouteController extends AbstractController { } @GetMapping("list") - public ModelAndView list(String populationInfoId) { + public ModelAndView list(String populationInfoId, String creator) { PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId); ModelAndView mv = new ModelAndView("dispute/list"); mv.addObject("dto", populationInfoDTO); + mv.addObject("creator", creator); return mv; } } \ No newline at end of file diff --git a/src/main/java/com/cm/population/controller/route/drug/DrugRouteController.java b/src/main/java/com/cm/population/controller/route/drug/DrugRouteController.java index 91e4454..5a61a5c 100644 --- a/src/main/java/com/cm/population/controller/route/drug/DrugRouteController.java +++ b/src/main/java/com/cm/population/controller/route/drug/DrugRouteController.java @@ -40,10 +40,11 @@ public class DrugRouteController extends AbstractController { } @GetMapping("list") - public ModelAndView list(String populationInfoId) { + public ModelAndView list(String populationInfoId, String creator) { PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId); ModelAndView mv = new ModelAndView("drug/list"); mv.addObject("dto", populationInfoDTO); + mv.addObject("creator", creator); return mv; } } \ No newline at end of file diff --git a/src/main/java/com/cm/population/controller/route/petition/PetitionRouteController.java b/src/main/java/com/cm/population/controller/route/petition/PetitionRouteController.java index 258e69f..6ae0976 100644 --- a/src/main/java/com/cm/population/controller/route/petition/PetitionRouteController.java +++ b/src/main/java/com/cm/population/controller/route/petition/PetitionRouteController.java @@ -40,10 +40,11 @@ public class PetitionRouteController extends AbstractController { } @GetMapping("list") - public ModelAndView list(String populationInfoId) { + public ModelAndView list(String populationInfoId, String creator) { PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId); ModelAndView mv = new ModelAndView("petition/list"); mv.addObject("dto", populationInfoDTO); + mv.addObject("creator", creator); return mv; } diff --git a/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoRouteController.java b/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoRouteController.java index 0cc0091..57c5600 100644 --- a/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoRouteController.java +++ b/src/main/java/com/cm/population/controller/route/populationinfo/PopulationInfoRouteController.java @@ -1,8 +1,11 @@ package com.cm.population.controller.route.populationinfo; import com.cm.common.base.AbstractController; +import com.cm.common.component.SecurityComponent; import com.cm.common.constants.ISystemConstant; +import com.cm.common.pojo.bos.UserInfoBO; import io.swagger.annotations.*; +import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import org.springframework.web.servlet.ModelAndView; @@ -18,6 +21,9 @@ import org.springframework.web.servlet.ModelAndView; @RequestMapping(ISystemConstant.ROUTE_PREFIX + "/populationinfo") public class PopulationInfoRouteController extends AbstractController { + @Autowired + protected SecurityComponent securityComponent; + @GetMapping("save") public ModelAndView save() { return new ModelAndView("populationinfo/save"); @@ -33,6 +39,14 @@ public class PopulationInfoRouteController extends AbstractController { return new ModelAndView("populationinfo/list"); } + @GetMapping("list-creator") + public ModelAndView listCreator() { + ModelAndView mv = new ModelAndView("populationinfo/list-creator"); + UserInfoBO userInfoBO = this.securityComponent.getCurrentUser(); + mv.addObject("creator", userInfoBO.getUserId()); + return mv; + } + @GetMapping("query") public ModelAndView query() { return new ModelAndView("populationinfo/query"); diff --git a/src/main/java/com/cm/population/controller/route/release/ReleaseRouteController.java b/src/main/java/com/cm/population/controller/route/release/ReleaseRouteController.java index e8e60ce..3a46ad3 100644 --- a/src/main/java/com/cm/population/controller/route/release/ReleaseRouteController.java +++ b/src/main/java/com/cm/population/controller/route/release/ReleaseRouteController.java @@ -35,10 +35,11 @@ public class ReleaseRouteController extends AbstractController { } @GetMapping("list") - public ModelAndView list(String populationInfoId) { + public ModelAndView list(String populationInfoId, String creator) { PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId); ModelAndView mv = new ModelAndView("release/list"); mv.addObject("dto", populationInfoDTO); + mv.addObject("creator", creator); return mv; } diff --git a/src/main/java/com/cm/population/controller/route/security/SecurityRouteController.java b/src/main/java/com/cm/population/controller/route/security/SecurityRouteController.java index 278100d..c31f8a6 100644 --- a/src/main/java/com/cm/population/controller/route/security/SecurityRouteController.java +++ b/src/main/java/com/cm/population/controller/route/security/SecurityRouteController.java @@ -40,10 +40,11 @@ public class SecurityRouteController extends AbstractController { } @GetMapping("list") - public ModelAndView list(String populationInfoId) { + public ModelAndView list(String populationInfoId, String creator) { PopulationInfoDTO populationInfoDTO = iPopulationInfoService.get(populationInfoId); ModelAndView mv = new ModelAndView("security/list"); mv.addObject("dto", populationInfoDTO); + mv.addObject("creator", creator); return mv; } diff --git a/src/main/resources/mybatis/mapper/correct/correct-mapper.xml b/src/main/resources/mybatis/mapper/correct/correct-mapper.xml index 682d031..6b94ce4 100644 --- a/src/main/resources/mybatis/mapper/correct/correct-mapper.xml +++ b/src/main/resources/mybatis/mapper/correct/correct-mapper.xml @@ -248,6 +248,9 @@ population_correct t1 WHERE t1.is_delete = 0 + + AND t1.creator = #{creator} + AND t1.charge = #{charge} diff --git a/src/main/resources/mybatis/mapper/cult/cult-mapper.xml b/src/main/resources/mybatis/mapper/cult/cult-mapper.xml index b3d5a93..6f80d40 100644 --- a/src/main/resources/mybatis/mapper/cult/cult-mapper.xml +++ b/src/main/resources/mybatis/mapper/cult/cult-mapper.xml @@ -264,6 +264,9 @@ population_cult t1 WHERE t1.is_delete = 0 + + AND t1.creator = #{creator} + AND t1.help = #{help} diff --git a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml index b89f062..d4f62fe 100644 --- a/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml +++ b/src/main/resources/mybatis/mapper/dispute/dispute-mapper.xml @@ -877,6 +877,9 @@ t1.risk_level = t11.dictionary_id WHERE t1.is_delete = 0 + + AND t1.creator = #{creator} + AND t1.case_name LIKE CONCAT('%', #{caseName}, '%') diff --git a/src/main/resources/mybatis/mapper/drug/drug-mapper.xml b/src/main/resources/mybatis/mapper/drug/drug-mapper.xml index 165ed2d..3343d22 100644 --- a/src/main/resources/mybatis/mapper/drug/drug-mapper.xml +++ b/src/main/resources/mybatis/mapper/drug/drug-mapper.xml @@ -251,29 +251,32 @@ + +
+
+ +
+ + +
+ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/resources/templates/release/list.html b/src/main/resources/templates/release/list.html index 9eb518c..db33190 100644 --- a/src/main/resources/templates/release/list.html +++ b/src/main/resources/templates/release/list.html @@ -98,7 +98,7 @@ var laydate = layui.laydate; var common = layui.common; var resizeTimeout = null; - var tableUrl = 'api/release/listpage?populationInfoId=[[${dto.populationInfoId}]]'; + var tableUrl = 'api/release/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]'; // 初始化表格 function initTable() { diff --git a/src/main/resources/templates/security/list.html b/src/main/resources/templates/security/list.html index ee6970c..467555d 100644 --- a/src/main/resources/templates/security/list.html +++ b/src/main/resources/templates/security/list.html @@ -117,7 +117,7 @@ var laydate = layui.laydate; var common = layui.common; var resizeTimeout = null; - var tableUrl = 'api/security/listpage?populationInfoId=[[${dto.populationInfoId}]]'; + var tableUrl = 'api/security/listpage?populationInfoId=[[${dto.populationInfoId}]]&creator=[[${creator}]]'; // 初始化处罚程度下拉选择 function initDegreeSelect() {