diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java index 112f19a..7295479 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/BaseDeptController.java @@ -9,6 +9,9 @@ import com.cyx.common.core.domain.entity.SysDept; import com.cyx.common.enums.BusinessType; import com.cyx.common.utils.StringUtils; import com.cyx.system.service.ISysDeptService; +import com.cyx.web.base.domain.TAmentBranch; +import com.cyx.web.base.domain.TAmentPersonnel; +import com.cyx.web.base.service.ITAmentPersonnelService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -48,6 +51,9 @@ public class BaseDeptController extends BaseController return deptList; } + @Autowired + private ITAmentPersonnelService personnelService; + /** * 新增部门 */ @@ -59,6 +65,7 @@ public class BaseDeptController extends BaseController parentId = getSysUser().getDeptId(); } mmap.put("dept", deptService.selectDeptById(parentId)); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/add"; } @@ -93,6 +100,7 @@ public class BaseDeptController extends BaseController dept.setParentName("无"); } mmap.put("dept", dept); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java index 8331296..5ac7962 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentBranchController.java @@ -8,6 +8,8 @@ import com.cyx.common.core.domain.AjaxResult; import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.enums.BusinessType; import com.cyx.common.utils.poi.ExcelUtil; +import com.cyx.web.base.domain.TAmentPersonnel; +import com.cyx.web.base.service.ITAmentPersonnelService; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -34,6 +36,8 @@ public class TAmentBranchController extends BaseController @Autowired private ITAmentBranchService tAmentBranchService; + @Autowired + private ITAmentPersonnelService personnelService; @RequiresPermissions("base:branch:view") @GetMapping() @@ -73,9 +77,12 @@ public class TAmentBranchController extends BaseController * 新增支部 */ @GetMapping("/add") - public String add() + public String add( ModelMap mmap) { + mmap.put("branchList",tAmentBranchService.selectTAmentBranchList(new TAmentBranch())); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/add"; + } /** @@ -99,6 +106,8 @@ public class TAmentBranchController extends BaseController { TAmentBranch tAmentBranch = tAmentBranchService.selectTAmentBranchByBranchId(branchId); mmap.put("tAmentBranch", tAmentBranch); + mmap.put("branchList",tAmentBranchService.selectTAmentBranchList(new TAmentBranch())); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java index 2047823..3c9cb69 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPartyAffairsController.java @@ -9,15 +9,13 @@ import com.alibaba.fastjson.JSONObject; import com.cyx.common.annotation.Log; import com.cyx.common.core.controller.BaseController; import com.cyx.common.core.domain.AjaxResult; +import com.cyx.common.core.domain.entity.SysDept; import com.cyx.common.core.page.TableDataInfo; import com.cyx.common.enums.BusinessType; import com.cyx.common.utils.poi.ExcelUtil; -import com.cyx.web.base.domain.TAmentCommitHis; -import com.cyx.web.base.domain.TAmentPersonnel; -import com.cyx.web.base.domain.TAmentReviewedHis; -import com.cyx.web.base.service.ITAmentCommitHisService; -import com.cyx.web.base.service.ITAmentPersonnelService; -import com.cyx.web.base.service.ITAmentReviewedHisService; +import com.cyx.system.service.ISysDeptService; +import com.cyx.web.base.domain.*; +import com.cyx.web.base.service.*; import org.apache.shiro.authz.annotation.RequiresPermissions; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Controller; @@ -27,8 +25,6 @@ import org.springframework.web.bind.annotation.PathVariable; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.ResponseBody; -import com.cyx.web.base.domain.TAmentPartyAffairs; -import com.cyx.web.base.service.ITAmentPartyAffairsService; /** * 党务Controller @@ -40,6 +36,13 @@ import com.cyx.web.base.service.ITAmentPartyAffairsService; @RequestMapping("/base/affairs") public class TAmentPartyAffairsController extends BaseController { + + @Autowired + private ITAmentPersonnelService personnelService; + @Autowired + private ISysDeptService deptService; + @Autowired + private ITAmentBranchService branchService; /** * 待办预警 */ @@ -324,6 +327,9 @@ public class TAmentPartyAffairsController extends BaseController { TAmentPartyAffairs tAmentPartyAffairs = tAmentPartyAffairsService.selectTAmentPartyAffairsById(id); mmap.put("tAmentPartyAffairs", tAmentPartyAffairs); + mmap.put("perList",personnelService.selectTAmentPersonnelList(new TAmentPersonnel())); + mmap.put("deptList",deptService.selectDeptList(new SysDept())); + mmap.put("branchList",branchService.selectTAmentBranchList(new TAmentBranch())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java index 667a38b..2643f6a 100644 --- a/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java +++ b/cyx-admin/src/main/java/com/cyx/web/base/controller/TAmentPersonnelController.java @@ -149,6 +149,8 @@ public class TAmentPersonnelController extends BaseController { TAmentPersonnel tAmentPersonnel = tAmentPersonnelService.selectTAmentPersonnelById(id); mmap.put("tAmentPersonnel", tAmentPersonnel); + mmap.put("deptList",deptService.selectDeptList(new SysDept())); + mmap.put("branchList",branchService.selectTAmentBranchList(new TAmentBranch())); return prefix + "/edit"; } diff --git a/cyx-admin/src/main/resources/templates/base/advanceddept/add.html b/cyx-admin/src/main/resources/templates/base/advanceddept/add.html index 8274537..2ea2c8e 100644 --- a/cyx-admin/src/main/resources/templates/base/advanceddept/add.html +++ b/cyx-admin/src/main/resources/templates/base/advanceddept/add.html @@ -69,7 +69,7 @@