Merge remote-tracking branch 'origin/master'

ruoyi-common/src/main/java/com/ruoyi/common/constant/PostCheckedProblemEnum.java

@@ -4,39 +4,32 @@ package com.ruoyi.common.constant;
  * 岗检问题状态枚举
  */
 public enum PostCheckedProblemEnum {
-    //状态：
-    // 1-待指定整改人（问题录入完成时）；
-    // 2-待填写方案（部门管理员指定整改人后）；
-//            3-方案填写完成；
-    // 10-部门审核通过；
-    // 11-部门审核驳回；
-    // 20-专业部门人审核（非必填）通过；
-    // 21-专业部门人审核驳回（非必填）；
-    // 30-整改人待上传实施（整改人上传实施图片）
-//            31-上传实施照片完成；
-    // 40-复查部门人审核通过；
-    // 41-复查部门人审核驳回
-
-
-
-
-
-
-    ADD("待指定整改人（问题录入完成时）；", 1),
-    EDIT_ONE("待填写方案（部门管理员指定整改人后）；", 2),
-    EDIT_ONE_OVER("方案填写完成", 2),
-
-    DEPT_PASS("部门审核通过；", 10),
-    DEPT_BACK("部门审核驳回；", 11),
-
-    ZHUAN_YE_PASS("专业部门人审核（非必填）通过；", 20),
-    ZHUAN_YE_BACK("专业部门人审核驳回（非必填）；", 21),
-
-    EDIT_TWO("整改人待上传实施（整改人上传实施图片）", 30),
-    EDIT_TWO_OVER("上传实施照片完成", 30),
-
-    FU_CHA_PASS("复查部门人审核通过；", 40),
-    FU_CHA_BACK("复查部门人审核驳回", 41);
+//	  1-待指定整改人（问题录入完成时）；2-待填写方案（部门管理员指定整改人后）；
+//    10-待部门审核；11-部门审核驳回；
+//    20-待专业部门人审核（非必填）；21-专业部门人审核驳回（非必填）；
+//    30-待整改人待上传实施（整改人上传实施图片）；
+//    40-待复查部门人审核；41-复查部门人审核通过；42-复查部门人审核驳回
+
+    ADD("待指定整改人（问题录入完成时）", 1),
+    EDIT_WAIT_ONR("待填写方案（部门管理员指定整改人后）", 2),
+//    EDIT_ONE_OVER("方案填写完成", 2),
+
+    DEPT_WAIT("待部门审核", 10),
+    //TODO 前台传过来的审核状态，数据库并不保存，部门审核通过后，单据流转到专业部门待审核或者方案待填写
+    DEPT_PASS("部门审核通过", 11),
+    DEPT_BACK("部门审核驳回", 12),
+
+    ZHUAN_ZY_WAIT("待专业部门人审核（非必填）", 20),
+    //TODO 前台传过来的审核状态，数据库并不保存，专业部门审核通过后，单据流转到待整改人待上传实施
+    ZHUAN_ZY_PASS("专业部门人审核通过（非必填）", 21),
+    ZHUAN_ZY_BACK("专业部门人审核驳回（非必填）；", 22),
+
+    EDIT_WAIT_TWO("待整改人待上传实施（整改人上传实施图片）", 30),
+    EDIT_TWO_OVER("上传实施照片完成", 31),
+
+    FU_CHA_WAIT("待复查部门人审核；", 40),
+    FU_CHA_PASS("复查部门人审核通过；", 41),
+    FU_CHA_BACK("复查部门人审核驳回", 42);
 
     private String name;
     private Integer value;

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedFunctionProblemStatisticsController.java

@@ -198,94 +198,77 @@ public class PostCheckedFunctionProblemStatisticsController extends BaseControll
 //        GROUP BY problem_category -- 问题类别（职责权限问题、工作内容问题、工作标准问题、考核奖励问题、任职资格问题、其他）
 
 
-        List<HistoryProblemNumberView> list = new ArrayList<>();
-        HistoryProblemNumberView data = new HistoryProblemNumberView();
-        data.setCheckYear(new Date());
-//        data.set问题总数
-//        data.set完成性
-//        data.set适宜性
-//        data.set有效性
-//        data.set职责权限
-//        data.set工作内容
-//        data.set工作标准
-//        data.set考核奖励
-//        data.set任职资格
-//        data.set其他
-
-        list.add(data);
-        return success(list);
+        Integer type = 1;
+        return success(postCheckedProblemService.historyProblemNumberView(type));
     }
 
-/*
     @ApiOperation("7-部门详情")
     @GetMapping("/deptDetaailView")
-    public AjaxResult deptDetaailView() {
+    public AjaxResult deptDetaailView(CheckedProblemDeptDetaailView notParam) { //notParam不是参数-是返回信息-方便接口联调
 //         查询问题表
 //        select * from "public"."post_checked_problem";
 //        group by duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
 //        GROUP BY problem_attribute -- 问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
 
 
-        List<DeptDetaailView> list = new ArrayList<>();
-
-        //TODO 第一步：得到4个职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-        //TODO 第二步：遍历职责类别 -> （总数和已完成数）设置问题属性（1-完整问题；2-有效性问题；3-适宜性问题；）
-        DeptDetaailView data1 = new DeptDetaailView();
-//        data4.setdutyTypeOne //业务职责
-        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child1 = new DeptDetaailView.ProblemAttributeInner();
-//        child1.set完整性数量") private Integer problemComplete;
-//        child1.set适宜性数量") private Integer problemSuitable;
-//        child1.set有效性数量") private Integer problemEffective;
-//        child1.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child1.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child1.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child1);
-        data1.setChildren(children1);
+        List<CheckedProblemDeptDetaailView> list = new ArrayList<>();
+
+        //TODO 第一步：得到各个部门ID、部门名称、问题总数量、重要问题数量、一般问题数量、统计时间
+        //TODO 第二步：得到4个职责类别的问题数量及整改完成数量(1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；)
+        //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
+
+
+        CheckedProblemDeptDetaailView data1 = new CheckedProblemDeptDetaailView();
+        data1.setDeptId(1l); //部门ID
+        data1.setDeptName("测试部门名称1");// 部门名称
+        data1.setProblemTotal(10); //问题数量
+        data1.setProblemLeveTwo(2); //重要问题
+        data1.setProblemLeveOne(8); //一般问题
+        data1.setStatisticsTime(new Date());// 统计时间
+
+//        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child1 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        child1.setProblemComplete(1); //child1.set完整性数量
+        child1.setProblemSuitable(2); //child1.set适宜性数量
+        child1.setProblemEffective(3);//child1.set有效性数量
+        //children1.add(child1);
+        //data1.setChildren(children1);
+        data1.getChildren().add(child1);
         list.add(data1);
 
-        DeptDetaailView data2 = new DeptDetaailView();
-//        data4.setdutyTypeTwo 党建及党风廉政
-        List<DeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child2 = new DeptDetaailView.ProblemAttributeInner();
-//        child2.set完整性数量") private Integer problemComplete;
-//        child2.set适宜性数量") private Integer problemSuitable;
-//        child2.set有效性数量") private Integer problemEffective;
-//        child2.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child2.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child2.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child2);
-        data2.setChildren(children2);
+        CheckedProblemDeptDetaailView data2 = new CheckedProblemDeptDetaailView();
+        data2.setDeptId(2l); //部门ID
+        data2.setDeptName("测试部门名称2");// 部门名称
+        data2.setProblemTotal(9); //问题数量
+        data2.setProblemLeveTwo(2); //重要问题
+        data2.setProblemLeveOne(7); //一般问题
+        data2.setStatisticsTime(new Date());// 统计时间
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child2 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        data2.getChildren().add(child2);
         list.add(data2);
 
-        DeptDetaailView data3 = new DeptDetaailView();
-//        data4.setdutyTypeThree 安全环保职责
-        List<DeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child3 = new DeptDetaailView.ProblemAttributeInner();
-//        child3.set完整性数量") private Integer problemComplete;
-//        child3.set适宜性数量") private Integer problemSuitable;
-//        child3.set有效性数量") private Integer problemEffective;
-//        child3.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child3.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child3.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child3);
-        data3.setChildren(children3);
+        CheckedProblemDeptDetaailView data3 = new CheckedProblemDeptDetaailView();
+        data3.setDeptId(3l); //部门ID
+        data3.setDeptName("测试部门名称3");// 部门名称
+        data3.setProblemTotal(8); //问题数量
+        data3.setProblemLeveTwo(3); //重要问题
+        data3.setProblemLeveOne(5); //一般问题
+        data3.setStatisticsTime(new Date());// 统计时间
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child3 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        data3.getChildren().add(child3);
         list.add(data3);
 
-        DeptDetaailView data4 = new DeptDetaailView();
-//        data4.setdutyTypeFour 合规保密职
-        List<DeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child4 = new DeptDetaailView.ProblemAttributeInner();
-//        child4.set完整性数量") private Integer problemComplete;
-//        child4.set适宜性数量") private Integer problemSuitable;
-//        child4.set有效性数量") private Integer problemEffective;
-//        child4.set已完成完整性数量") private Integer problemCompleteChecked;
-//        child4.set已完成适宜性数量") private Integer problemSuitableChecked;
-//        child4.set已完成有效性数量") private Integer problemEffectiveChecked;
-        children1.add(child4);
-        data4.setChildren(children4);
+        CheckedProblemDeptDetaailView data4 = new CheckedProblemDeptDetaailView();
+        data4.setDeptId(4l); //部门ID
+        data4.setDeptName("测试部门名称4");// 部门名称
+        data4.setProblemTotal(6); //问题数量
+        data4.setProblemLeveTwo(1); //重要问题
+        data4.setProblemLeveOne(5); //一般问题
+        data4.setStatisticsTime(new Date());// 统计时间
+        CheckedProblemDeptDetaailView.ProblemAttributeInner child4 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
+        data4.getChildren().add(child4);
         list.add(data4);
-        return success(list);
+        Integer type = 1;
+        return success(postCheckedProblemService.deptDetaailView(type));
     }
-    */
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedProblemController.java

@@ -89,7 +89,7 @@ public class PostCheckedProblemController extends BaseController {
     public TableDataInfo list(PostCheckedProblem postCheckedProblem) {
 
 //        startPage();
-        startPage("desc","t1.create_time");
+        startPage("desc", "t1.create_time");
         List<PostCheckedProblem> list = postCheckedProblemService.selectPostCheckedProblemList(postCheckedProblem);
         return getDataTable(list);
     }
@@ -277,13 +277,13 @@ public class PostCheckedProblemController extends BaseController {
             @ApiImplicitParam(name = "problemCause", value = "问题原因", dataType = "String", dataTypeClass = String.class),
             @ApiImplicitParam(name = "isImmediatelyCorrected", value = "是否立行立改(1-Yes；2-No；)", dataType = "Integer", dataTypeClass = Integer.class),
             @ApiImplicitParam(name = "rectificationMeasure", value = "整改措施/建议", dataType = "String", dataTypeClass = String.class),
-            @ApiImplicitParam(name = "rectificationResponsibleUserId", value = "整改责任人ID", dataType = "Long", dataTypeClass = Long.class),
+//            @ApiImplicitParam(name = "rectificationResponsibleUserId", value = "整改责任人ID", dataType = "Long", dataTypeClass = Long.class),
             @ApiImplicitParam(name = "rectificationPeriod", value = "整改期限", dataType = "Date", dataTypeClass = Date.class),
     })
     @Log(title = "方案整改", businessType = BusinessType.UPDATE)
     @PutMapping("/updateRectificationMeasure")
-    public AjaxResult updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Long rectificationResponsibleUserId, Date rectificationPeriod) {
-        return toAjax(postCheckedProblemService.updateRectificationMeasure(id, problemCause, isImmediatelyCorrected, rectificationMeasure, rectificationResponsibleUserId, rectificationPeriod));
+    public AjaxResult updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Date rectificationPeriod) {
+        return toAjax(postCheckedProblemService.updateRectificationMeasure(id, problemCause, isImmediatelyCorrected, rectificationMeasure, rectificationPeriod));
     }
 
 
@@ -299,7 +299,6 @@ public class PostCheckedProblemController extends BaseController {
     }
 
 
-
     @ApiOperation("步骤4->审核1：部门经理审核")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
@@ -309,11 +308,10 @@ public class PostCheckedProblemController extends BaseController {
     @Log(title = "审核1：部门经理审核", businessType = BusinessType.UPDATE)
     @PutMapping("/setDeptApproveTime")
     public AjaxResult setDeptApproveTime(Long id, Integer status, String reason) {
-        return toAjax(postCheckedProblemService.setDeptApproveTime(id, status,  reason));
+        return toAjax(postCheckedProblemService.setDeptApproveTime(id, status, reason));
     }
 
 
-
     @ApiOperation("步骤5->审核2：专业部门审核人审核")
     @ApiImplicitParams({
             @ApiImplicitParam(name = "id", value = "主键", dataType = "Long", dataTypeClass = Long.class),
@@ -323,7 +321,7 @@ public class PostCheckedProblemController extends BaseController {
     @Log(title = "审核2：专业部门审核人审核", businessType = BusinessType.UPDATE)
     @PutMapping("/setSpecialityDepartmentReviewTime")
     public AjaxResult setSpecialityDepartmentReviewTime(Long id, Integer status, String reason) {
-        return toAjax(postCheckedProblemService.setSpecialityDepartmentReviewTime(id, status,  reason));
+        return toAjax(postCheckedProblemService.setSpecialityDepartmentReviewTime(id, status, reason));
     }
 
 
@@ -367,7 +365,6 @@ public class PostCheckedProblemController extends BaseController {
     }
 
 
-
     @ApiOperation("Tools-1、按问题属性分组统计问题类别")
     @GetMapping("/problemCategoryByAttribute")
     public AjaxResult problemCategoryByAttribute(ProblemCategory noParam) {

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedProductionProblemStatisticsController.java

@@ -17,14 +17,6 @@ import java.util.List;
 import java.util.Map;
 
 
-
-
-
-
-
-
-
-
 /**
  * 岗检问题表Controller
  *
@@ -50,7 +42,7 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
         List<FunctionDeptProblemContrastView> list = new ArrayList<>();
         Integer type = 2;
         List<Map<String, Object>> deptIdListByType = postCheckedProblemService.getDeptIdListByType(type);
-        if (deptIdListByType!=null && deptIdListByType.size()>0){
+        if (deptIdListByType != null && deptIdListByType.size() > 0) {
             for (Map<String, Object> map : deptIdListByType) {
                 FunctionDeptProblemContrastView data = new FunctionDeptProblemContrastView();
                 data.setDeptId(Long.parseLong(map.get("deptId").toString()));
@@ -72,13 +64,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        is_rectification_completed = 1 整改情况-是否完成(1-Yes；2-No；)
 
 
-        List<CoverageRateView> list = new ArrayList<>();
-        CoverageRateView data = new CoverageRateView();
-        data.setProblemTotal(6);
-        data.setProblemComplete(5);
-
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.coverageRateView(type));
     }
 
     @ApiOperation("3-岗检问题职责类别占比")
@@ -89,15 +76,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        group by duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
 
 
-        List<DutyTypeProblemStatisticsView> list = new ArrayList<>();
-        DutyTypeProblemStatisticsView data = new DutyTypeProblemStatisticsView();
-        data.setDutyTypeOne(1);
-        data.setDutyTypeTwo(2);
-        data.setDutyTypeThree(3);
-        data.setDutyTypeFour(4);
-
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.dutyTypeProblemStatisticsView(type));
     }
 
     @ApiOperation("4-岗检问题级别占比")
@@ -107,14 +87,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        select * from "public"."post_checked_problem";
 //        group by problem_level   问题等级（一般、重要）
 
-        List<ProblemLevelView> list = new ArrayList<>();
-        ProblemLevelView data = new ProblemLevelView();
-        data.setProblemLeveOne(2);
-        data.setProblemLeveTwo(1);
-
-
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.problemLevelView(type));
     }
 
 
@@ -205,7 +179,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
         list.add(data6);
 
 
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.problemAttributeCategoryView(type));
     }
 
 
@@ -232,8 +207,8 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
 //        data.set任职资格
 //        data.set其他
 
-        list.add(data);
-        return success(list);
+        Integer type = 2;
+        return success(postCheckedProblemService.historyProblemNumberView(type));
     }
 
 
@@ -253,70 +228,55 @@ public class PostCheckedProductionProblemStatisticsController extends BaseContro
         //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
 
 
-
         CheckedProblemDeptDetaailView data1 = new CheckedProblemDeptDetaailView();
-//        data1.setdeptId 部门ID
-//        data1.setdeptName 部门名称
-//        data1.setproblemTotal 问题数量
-//        data1.setproblemLeveTwo 重要问题
-//        data1.setproblemLeveOne 一般问题
-//        data1.setstatisticsTime 统计时间
-
-        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        data1.setDeptId(1l); //部门ID
+        data1.setDeptName("测试部门名称1");// 部门名称
+        data1.setProblemTotal(10); //问题数量
+        data1.setProblemLeveTwo(2); //重要问题
+        data1.setProblemLeveOne(8); //一般问题
+        data1.setStatisticsTime(new Date());// 统计时间
+
+//        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
         CheckedProblemDeptDetaailView.ProblemAttributeInner child1 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
-//        child1.set完整性数量") private Integer problemComplete;
-//        child1.set适宜性数量") private Integer problemSuitable;
-//        child1.set有效性数量") private Integer problemEffective;
-        children1.add(child1);
-        data1.setChildren(children1);
+        child1.setProblemComplete(1); //child1.set完整性数量
+        child1.setProblemSuitable(2); //child1.set适宜性数量
+        child1.setProblemEffective(3);//child1.set有效性数量
+        //children1.add(child1);
+        //data1.setChildren(children1);
+        data1.getChildren().add(child1);
         list.add(data1);
 
         CheckedProblemDeptDetaailView data2 = new CheckedProblemDeptDetaailView();
-//        data2.setdeptId 部门ID
-//        data2.setdeptName 部门名称
-//        data2.setproblemTotal 问题数量
-//        data2.setproblemLeveTwo 重要问题
-//        data2.setproblemLeveOne 一般问题
-//        data2.setstatisticsTime 统计时间
-        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
+        data2.setDeptId(2l); //部门ID
+        data2.setDeptName("测试部门名称2");// 部门名称
+        data2.setProblemTotal(9); //问题数量
+        data2.setProblemLeveTwo(2); //重要问题
+        data2.setProblemLeveOne(7); //一般问题
+        data2.setStatisticsTime(new Date());// 统计时间
         CheckedProblemDeptDetaailView.ProblemAttributeInner child2 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
-//        child2.set完整性数量") private Integer problemComplete;
-//        child2.set适宜性数量") private Integer problemSuitable;
-//        child2.set有效性数量") private Integer problemEffective;
-        children1.add(child2);
-        data2.setChildren(children2);
+        data2.getChildren().add(child2);
         list.add(data2);
 
         CheckedProblemDeptDetaailView data3 = new CheckedProblemDeptDetaailView();
-//        data3.setdeptId 部门ID
-//        data3.setdeptName 部门名称
-//        data3.setproblemTotal 问题数量
-//        data3.setproblemLeveTwo 重要问题
-//        data3.setproblemLeveOne 一般问题
-//        data3.setstatisticsTime 统计时间
-        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
+        data3.setDeptId(3l); //部门ID
+        data3.setDeptName("测试部门名称3");// 部门名称
+        data3.setProblemTotal(8); //问题数量
+        data3.setProblemLeveTwo(3); //重要问题
+        data3.setProblemLeveOne(5); //一般问题
+        data3.setStatisticsTime(new Date());// 统计时间
         CheckedProblemDeptDetaailView.ProblemAttributeInner child3 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
-//        child3.set完整性数量") private Integer problemComplete;
-//        child3.set适宜性数量") private Integer problemSuitable;
-//        child3.set有效性数量") private Integer problemEffective;
-        children1.add(child3);
-        data3.setChildren(children3);
+        data3.getChildren().add(child3);
         list.add(data3);
 
         CheckedProblemDeptDetaailView data4 = new CheckedProblemDeptDetaailView();
-//        data4.setdeptId 部门ID
-//        data4.setdeptName 部门名称
-//        data4.setproblemTotal 问题数量
-//        data4.setproblemLeveTwo 重要问题
-//        data4.setproblemLeveOne 一般问题
-//        data4.setstatisticsTime 统计时间
-        List<CheckedProblemDeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
+        data4.setDeptId(4l); //部门ID
+        data4.setDeptName("测试部门名称4");// 部门名称
+        data4.setProblemTotal(6); //问题数量
+        data4.setProblemLeveTwo(1); //重要问题
+        data4.setProblemLeveOne(5); //一般问题
+        data4.setStatisticsTime(new Date());// 统计时间
         CheckedProblemDeptDetaailView.ProblemAttributeInner child4 = new CheckedProblemDeptDetaailView.ProblemAttributeInner();
-//        child4.set完整性数量") private Integer problemComplete;
-//        child4.set适宜性数量") private Integer problemSuitable;
-//        child4.set有效性数量") private Integer problemEffective;
-        children1.add(child4);
-        data4.setChildren(children4);
+        data4.getChildren().add(child4);
         list.add(data4);
         return success(list);
     }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedRectificationFunctionProblemStatisticsController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -277,77 +278,41 @@ public class PostCheckedRectificationFunctionProblemStatisticsController extends
         //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
 
         DeptDetaailView data1 = new DeptDetaailView();
-//        data1.setdeptId 部门ID
-//        data1.setdeptName 部门名称
-//        data1.setproblemRectificationRate 整改率
-//        data1.setstatisticsTime 统计时间
-
-        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        data1.setDeptId(1l); //部门ID
+        data1.setDeptName("测试部门名称1");// 部门名称
+        data1.setProblemRectificationRate(new BigDecimal(0.9)); //整改率
+        data1.setStatisticsTime(new Date());// 统计时间
+//        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
         DeptDetaailView.ProblemAttributeInner child1 = new DeptDetaailView.ProblemAttributeInner();
-//        child1.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child1.set完整性数量 private Integer problemComplete;
-//        child1.set适宜性数量 private Integer problemSuitable;
-//        child1.set有效性数量 private Integer problemEffective;
-//        child1.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child1.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child1.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child1);
-        data1.setChildren(children1);
+        //业务职责字典值 private Integer ; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+        child1.setDutyType(1);
+        child1.setProblemComplete(1);//完整性数量
+        child1.setProblemSuitable(2);//适宜性数量
+        child1.setProblemEffective(3);//有效性数量
+        child1.setProblemCompleteChecked(0);//已完成完整性数量
+        child1.setProblemSuitableChecked(1);//已完成适宜性数量
+        child1.setProblemEffectiveChecked(2);//已完成有效性数量
+        // children1.add(child1);
+        // data1.setChildren(children1);
+        data1.getChildren().add(child1);
         list.add(data1);
 
         DeptDetaailView data2 = new DeptDetaailView();
-//        data2.setdeptId 部门ID
-//        data2.setdeptName 部门名称
-//        data2.setproblemRectificationRate 整改率
-//        data2.setstatisticsTime 统计时间
-        List<DeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
+        data2.setDeptId(2l); //部门ID
+        data2.setDeptName("测试部门名称2");// 部门名称
+        data2.setProblemRectificationRate(new BigDecimal(0.9)); //整改率
+        data2.setStatisticsTime(new Date());// 统计时间
         DeptDetaailView.ProblemAttributeInner child2 = new DeptDetaailView.ProblemAttributeInner();
-//        child2.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child2.set完整性数量  private Integer problemComplete;
-//        child2.set适宜性数量  private Integer problemSuitable;
-//        child2.set有效性数量  private Integer problemEffective;
-//        child2.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child2.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child2.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child2);
-        data2.setChildren(children2);
+        child2.setDutyType(1);
+        child2.setProblemComplete(1);//完整性数量
+        child2.setProblemSuitable(2);//适宜性数量
+        child2.setProblemEffective(3);//有效性数量
+        child2.setProblemCompleteChecked(0);//已完成完整性数量
+        child2.setProblemSuitableChecked(1);//已完成适宜性数量
+        child2.setProblemEffectiveChecked(2);//已完成有效性数量
+        data2.getChildren().add(child2);
         list.add(data2);
 
-        DeptDetaailView data3 = new DeptDetaailView();
-//        data3.setdeptId 部门ID
-//        data3.setdeptName 部门名称
-//        data3.setproblemRectificationRate 整改率
-//        data3.setstatisticsTime 统计时间
-        List<DeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child3 = new DeptDetaailView.ProblemAttributeInner();
-//        child3.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child3.set完整性数量  private Integer problemComplete;
-//        child3.set适宜性数量  private Integer problemSuitable;
-//        child3.set有效性数量  private Integer problemEffective;
-//        child3.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child3.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child3.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child3);
-        data3.setChildren(children3);
-        list.add(data3);
-
-        DeptDetaailView data4 = new DeptDetaailView();
-//        data4.setdeptId 部门ID
-//        data4.setdeptName 部门名称
-//        data4.setproblemRectificationRate 整改率
-//        data4.setstatisticsTime 统计时间
-        List<DeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child4 = new DeptDetaailView.ProblemAttributeInner();
-//        child4.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child4.set完整性数量 private Integer problemComplete;
-//        child4.set适宜性数量 private Integer problemSuitable;
-//        child4.set有效性数量 private Integer problemEffective;
-//        child4.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child4.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child4.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child4);
-        data4.setChildren(children4);
-        list.add(data4);
         return success(list);
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/controller/PostCheckedRectificationProductionProblemStatisticsController.java

@@ -11,6 +11,7 @@ import org.springframework.web.bind.annotation.GetMapping;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import java.math.BigDecimal;
 import java.util.ArrayList;
 import java.util.Date;
 import java.util.List;
@@ -277,77 +278,40 @@ public class PostCheckedRectificationProductionProblemStatisticsController exten
         //TODO 第三步：设置部门的整改率：遍历职责类别计算整改率
 
         DeptDetaailView data1 = new DeptDetaailView();
-//        data1.setdeptId 部门ID
-//        data1.setdeptName 部门名称
-//        data1.setproblemRectificationRate 整改率
-//        data1.setstatisticsTime 统计时间
-
-        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
+        data1.setDeptId(1l); //部门ID
+        data1.setDeptName("测试部门名称1111");// 部门名称
+        data1.setProblemRectificationRate(new BigDecimal(0.9)); //整改率
+        data1.setStatisticsTime(new Date());// 统计时间
+//        List<DeptDetaailView.ProblemAttributeInner> children1 = new ArrayList<>();
         DeptDetaailView.ProblemAttributeInner child1 = new DeptDetaailView.ProblemAttributeInner();
-//        child1.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child1.set完整性数量 private Integer problemComplete;
-//        child1.set适宜性数量 private Integer problemSuitable;
-//        child1.set有效性数量 private Integer problemEffective;
-//        child1.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child1.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child1.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child1);
-        data1.setChildren(children1);
+        //业务职责字典值 private Integer ; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
+        child1.setDutyType(1);
+        child1.setProblemComplete(1);//完整性数量
+        child1.setProblemSuitable(2);//适宜性数量
+        child1.setProblemEffective(3);//有效性数量
+        child1.setProblemCompleteChecked(0);//已完成完整性数量
+        child1.setProblemSuitableChecked(1);//已完成适宜性数量
+        child1.setProblemEffectiveChecked(2);//已完成有效性数量
+        // children1.add(child1);
+        // data1.setChildren(children1);
+        data1.getChildren().add(child1);
         list.add(data1);
 
         DeptDetaailView data2 = new DeptDetaailView();
-//        data2.setdeptId 部门ID
-//        data2.setdeptName 部门名称
-//        data2.setproblemRectificationRate 整改率
-//        data2.setstatisticsTime 统计时间
-        List<DeptDetaailView.ProblemAttributeInner> children2 = new ArrayList<>();
+        data2.setDeptId(2l); //部门ID
+        data2.setDeptName("测试部门名称2222");// 部门名称
+        data2.setProblemRectificationRate(new BigDecimal(0.9)); //整改率
+        data2.setStatisticsTime(new Date());// 统计时间
         DeptDetaailView.ProblemAttributeInner child2 = new DeptDetaailView.ProblemAttributeInner();
-//        child2.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child2.set完整性数量  private Integer problemComplete;
-//        child2.set适宜性数量  private Integer problemSuitable;
-//        child2.set有效性数量  private Integer problemEffective;
-//        child2.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child2.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child2.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child2);
-        data2.setChildren(children2);
+        child2.setDutyType(1);
+        child2.setProblemComplete(1);//完整性数量
+        child2.setProblemSuitable(2);//适宜性数量
+        child2.setProblemEffective(3);//有效性数量
+        child2.setProblemCompleteChecked(0);//已完成完整性数量
+        child2.setProblemSuitableChecked(1);//已完成适宜性数量
+        child2.setProblemEffectiveChecked(2);//已完成有效性数量
+        data2.getChildren().add(child2);
         list.add(data2);
-
-        DeptDetaailView data3 = new DeptDetaailView();
-//        data3.setdeptId 部门ID
-//        data3.setdeptName 部门名称
-//        data3.setproblemRectificationRate 整改率
-//        data3.setstatisticsTime 统计时间
-        List<DeptDetaailView.ProblemAttributeInner> children3 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child3 = new DeptDetaailView.ProblemAttributeInner();
-//        child3.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child3.set完整性数量  private Integer problemComplete;
-//        child3.set适宜性数量  private Integer problemSuitable;
-//        child3.set有效性数量  private Integer problemEffective;
-//        child3.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child3.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child3.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child3);
-        data3.setChildren(children3);
-        list.add(data3);
-
-        DeptDetaailView data4 = new DeptDetaailView();
-//        data4.setdeptId 部门ID
-//        data4.setdeptName 部门名称
-//        data4.setproblemRectificationRate 整改率
-//        data4.setstatisticsTime 统计时间
-        List<DeptDetaailView.ProblemAttributeInner> children4 = new ArrayList<>();
-        DeptDetaailView.ProblemAttributeInner child4 = new DeptDetaailView.ProblemAttributeInner();
-//        child4.set业务职责字典值 private Integer dutyType; 业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；
-//        child4.set完整性数量 private Integer problemComplete;
-//        child4.set适宜性数量 private Integer problemSuitable;
-//        child4.set有效性数量 private Integer problemEffective;
-//        child4.set已完成完整性数量 private Integer problemCompleteChecked;
-//        child4.set已完成适宜性数量 private Integer problemSuitableChecked;
-//        child4.set已完成有效性数量 private Integer problemEffectiveChecked;
-        children1.add(child4);
-        data4.setChildren(children4);
-        list.add(data4);
         return success(list);
     }
 }

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/CheckedProblemDeptDetaailView.java

@@ -15,9 +15,10 @@ import java.util.List;
 @Data
 @ApiModel(value = "统计分析-部门详情（职能管理）")
 //extends DutyTypeProblemStatisticsView
-public class CheckedProblemDeptDetaailView extends  ProblemLevelView implements Serializable {
+public class CheckedProblemDeptDetaailView extends ProblemLevelView {
 
-    private static final long serialVersionUID = 5666890687691604123L;
+
+    private static final long serialVersionUID = -1417514493751943760L;
     @ApiModelProperty("部门ID")
     private Long deptId;
     @ApiModelProperty("部门名称")
@@ -25,7 +26,7 @@ public class CheckedProblemDeptDetaailView extends  ProblemLevelView implements
 
 
     @ApiModelProperty("总数量")
-    private Integer problemTotal;
+    private int problemTotal;
 
 //    @ApiModelProperty("一般")
 //    private Integer problemLeveOne;
@@ -45,27 +46,27 @@ public class CheckedProblemDeptDetaailView extends  ProblemLevelView implements
      * 按业务职责归类存放问题整改的情况
      */
 //            extends ProblemNumberBase {
-    public static class ProblemAttributeInner implements Serializable {
-
-        private static final long serialVersionUID = 3140695152506065277L;
+    @Data
+    public static class ProblemAttributeInner implements Serializable{
 
+        private static final long serialVersionUID = 1635970865375548967L;
         @ApiModelProperty("业务职责字典值-前端自己显示中文名称：duty_type 职责类别：1-业务职责；2-党建及党风廉政；3-安全环保职责；4-合规保密职；")
         private Integer dutyType;
 
 
         @ApiModelProperty("完整性数量")
-        private Integer problemComplete;
+        private int problemComplete;
         @ApiModelProperty("适宜性数量")
-        private Integer problemSuitable;
+        private int problemSuitable;
         @ApiModelProperty("有效性数量")
-        private Integer problemEffective;
+        private int problemEffective;
 
         @ApiModelProperty("已完成完整性数量")
-        private Integer problemCompleteChecked;
+        private int problemCompleteChecked;
         @ApiModelProperty("已完成适宜性数量")
-        private Integer problemSuitableChecked;
+        private int problemSuitableChecked;
         @ApiModelProperty("已完成有效性数量")
-        private Integer problemEffectiveChecked;
+        private int problemEffectiveChecked;
 
     }
 

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/DeptDetaailView.java

@@ -36,6 +36,7 @@ public class DeptDetaailView implements Serializable {
      * 按业务职责归类存放问题整改的情况
      */
 //            extends ProblemNumberBase {
+    @Data
     public static class ProblemAttributeInner implements Serializable {
 
         private static final long serialVersionUID = 3140695152506065277L;

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/domain/problemStatistics/ProblemLevelView.java

@@ -17,10 +17,10 @@ public class ProblemLevelView implements Serializable {
     private static final long serialVersionUID = -6982314157222524166L;
 
     @ApiModelProperty("一般")
-    private Integer problemLeveOne;
+    private int problemLeveOne;
 
     @ApiModelProperty("重要")
-    private Integer problemLeveTwo;
+    private int problemLeveTwo;
 
 
 

ruoyi-postcheck/src/main/java/com/ruoyi/postCheck/service/IPostCheckedProblemService.java

@@ -11,9 +11,11 @@ import com.ruoyi.postCheck.domain.homePage.DeptProblemRectificationView;
 import com.ruoyi.postCheck.domain.homePage.PostCheckedProblemView;
 import com.ruoyi.postCheck.domain.homePage.PostCheckedUnCheckedView;
 import com.ruoyi.postCheck.domain.homePage.PostTotalView;
+import com.ruoyi.postCheck.domain.problemStatistics.CheckedProblemDeptDetaailView;
 import com.ruoyi.postCheck.domain.problemStatistics.CoverageRateView;
 import com.ruoyi.postCheck.domain.problemStatistics.DutyTypeProblemStatisticsView;
 import com.ruoyi.postCheck.domain.problemStatistics.FunctionDeptProblemContrastView;
+import com.ruoyi.postCheck.domain.problemStatistics.HistoryProblemNumberView;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemAttributeCategoryView;
 import com.ruoyi.postCheck.domain.problemStatistics.ProblemLevelView;
 import com.ruoyi.postCheck.domain.tools.ProblemCategory;
@@ -99,11 +101,11 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
      * @param problemCause                   问题原因
      * @param isImmediatelyCorrected         是否立行立改(1-Yes；2-No；)
      * @param rectificationMeasure           整改措施/建议
-     * @param rectificationResponsibleUserId 整改责任人ID
+     * param rectificationResponsibleUserId 整改责任人ID
      * @param rectificationPeriod            整改期限
      * @return
      */
-    int updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure, Long rectificationResponsibleUserId, Date rectificationPeriod);
+    int updateRectificationMeasure(Long id, String problemCause, Integer isImmediatelyCorrected, String rectificationMeasure,Date rectificationPeriod);
 
     /**
      * 指定专业部门的审核人
@@ -197,4 +199,8 @@ public interface IPostCheckedProblemService extends IService<PostCheckedProblem>
     List<ProblemLevelView>  problemLevelView(Integer type);
 
     List<ProblemAttributeCategoryView> problemAttributeCategoryView(Integer type);
+
+    List<HistoryProblemNumberView>  historyProblemNumberView(Integer type);
+
+    List<CheckedProblemDeptDetaailView>  deptDetaailView(Integer type);
 }

ruoyi-system/src/main/java/com/ruoyi/system/domain/UserPostAuthority.java

@@ -0,0 +1,24 @@
+package com.ruoyi.system.domain;
+
+import lombok.Data;
+
+/**
+ * 用户岗位权限实体类
+ */
+@Data
+public class UserPostAuthority {
+
+   private Long userId;
+   private String userName;
+   private String nickName;
+
+   private Long postId;
+   private String postCode;
+   private String postName;
+    /**
+     * 岗位级别：0-不设置；1-经理；
+     */
+   private Integer postLevel;
+
+
+}

ruoyi-system/src/main/java/com/ruoyi/system/mapper/SysPostMapper.java

@@ -1,18 +1,20 @@
 package com.ruoyi.system.mapper;
 
 import java.util.List;
+
 import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.UserPostAuthority;
+import org.apache.ibatis.annotations.Param;
 
 /**
  * 岗位信息 数据层
- * 
+ *
  * @author ruoyi
  */
-public interface SysPostMapper
-{
+public interface SysPostMapper {
     /**
      * 查询岗位数据集合
-     * 
+     *
      * @param post 岗位信息
      * @return 岗位数据集合
      */
@@ -20,14 +22,14 @@ public interface SysPostMapper
 
     /**
      * 查询所有岗位
-     * 
+     *
      * @return 岗位列表
      */
     public List<SysPost> selectPostAll();
 
     /**
      * 通过岗位ID查询岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 角色对象信息
      */
@@ -35,7 +37,7 @@ public interface SysPostMapper
 
     /**
      * 根据用户ID获取岗位选择框列表
-     * 
+     *
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
@@ -43,7 +45,7 @@ public interface SysPostMapper
 
     /**
      * 查询用户所属岗位组
-     * 
+     *
      * @param userName 用户名
      * @return 结果
      */
@@ -51,7 +53,7 @@ public interface SysPostMapper
 
     /**
      * 删除岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -59,7 +61,7 @@ public interface SysPostMapper
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位ID
      * @return 结果
      */
@@ -67,7 +69,7 @@ public interface SysPostMapper
 
     /**
      * 修改岗位信息
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -75,7 +77,7 @@ public interface SysPostMapper
 
     /**
      * 新增岗位信息
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -83,7 +85,7 @@ public interface SysPostMapper
 
     /**
      * 校验岗位名称
-     * 
+     *
      * @param postName 岗位名称
      * @return 结果
      */
@@ -91,7 +93,7 @@ public interface SysPostMapper
 
     /**
      * 校验岗位编码
-     * 
+     *
      * @param postCode 岗位编码
      * @return 结果
      */
@@ -99,8 +101,11 @@ public interface SysPostMapper
 
     /**
      * 根据部门查询岗位
+     *
      * @param deptId
      * @return
      */
     public SysPost selectPostByDeptId(Long deptId);
+
+    List<UserPostAuthority> userPostAuthorityList(@Param("deptId") Long deptId, @Param("postLevel") Integer postLevel);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/ISysPostService.java

@@ -3,17 +3,18 @@ package com.ruoyi.system.service;
 import java.util.List;
 
 import com.ruoyi.system.domain.SysPost;
+import com.ruoyi.system.domain.UserPostAuthority;
 
 /**
  * 岗位信息 服务层
- * 
+ *
  * @author ruoyi
  */
 public interface ISysPostService
 {
     /**
      * 查询岗位信息集合
-     * 
+     *
      * @param post 岗位信息
      * @return 岗位列表
      */
@@ -21,14 +22,14 @@ public interface ISysPostService
 
     /**
      * 查询所有岗位
-     * 
+     *
      * @return 岗位列表
      */
     public List<SysPost> selectPostAll();
 
     /**
      * 通过岗位ID查询岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 角色对象信息
      */
@@ -36,7 +37,7 @@ public interface ISysPostService
 
     /**
      * 根据用户ID获取岗位选择框列表
-     * 
+     *
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
@@ -44,7 +45,7 @@ public interface ISysPostService
 
     /**
      * 校验岗位名称
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -52,7 +53,7 @@ public interface ISysPostService
 
     /**
      * 校验岗位编码
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -60,7 +61,7 @@ public interface ISysPostService
 
     /**
      * 通过岗位ID查询岗位使用数量
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -68,7 +69,7 @@ public interface ISysPostService
 
     /**
      * 删除岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
@@ -76,7 +77,7 @@ public interface ISysPostService
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位ID
      * @return 结果
      */
@@ -84,7 +85,7 @@ public interface ISysPostService
 
     /**
      * 新增保存岗位信息
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -92,7 +93,7 @@ public interface ISysPostService
 
     /**
      * 修改保存岗位信息
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
@@ -104,4 +105,19 @@ public interface ISysPostService
      * @return
      */
     public SysPost selectPostByDeptId(Long deptId);
+
+    /**
+     * 查询部门经理级别岗位下的人员列表
+     * @param deptId 部门ID
+     * @param postLevel 岗位级别：0-不设置；1-经理；
+     * @return
+     */
+    List<UserPostAuthority> userPostAuthorityList(Long deptId,Integer postLevel);
+
+    /**
+     * 当前登录用户是否为部门经理级别
+     * @param deptId 部门ID
+     * @return
+     */
+   boolean userHaveAuthority(Long deptId);
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.Iterator;
 import java.util.List;
 import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.annotation.DataScope;
@@ -23,12 +25,11 @@ import com.ruoyi.system.service.ISysDeptService;
 
 /**
  * 部门管理 服务实现
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class SysDeptServiceImpl implements ISysDeptService
-{
+public class SysDeptServiceImpl implements ISysDeptService {
     @Autowired
     private SysDeptMapper deptMapper;
 
@@ -37,52 +38,46 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 查询部门管理数据
-     * 
+     *
      * @param dept 部门信息
      * @return 部门信息集合
      */
     @Override
     @DataScope(deptAlias = "d")
-    public List<SysDept> selectDeptList(SysDept dept)
-    {
+    public List<SysDept> selectDeptList(SysDept dept) {
         return deptMapper.selectDeptList(dept);
     }
 
     /**
      * 查询部门树结构信息
-     * 
+     *
      * @param dept 部门信息
      * @return 部门树信息集合
      */
     @Override
-    public List<TreeSelect> selectDeptTreeList(SysDept dept)
-    {
+    public List<TreeSelect> selectDeptTreeList(SysDept dept) {
         List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
         return buildDeptTreeSelect(depts);
     }
 
     /**
      * 构建前端所需要树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 树结构列表
      */
     @Override
-    public List<SysDept> buildDeptTree(List<SysDept> depts)
-    {
+    public List<SysDept> buildDeptTree(List<SysDept> depts) {
         List<SysDept> returnList = new ArrayList<SysDept>();
         List<Long> tempList = depts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
-        for (SysDept dept : depts)
-        {
+        for (SysDept dept : depts) {
             // 如果是顶级节点, 遍历该父节点的所有子节点
-            if (!tempList.contains(dept.getParentId()))
-            {
+            if (!tempList.contains(dept.getParentId())) {
                 recursionFn(depts, dept);
                 returnList.add(dept);
             }
         }
-        if (returnList.isEmpty())
-        {
+        if (returnList.isEmpty()) {
             returnList = depts;
         }
         return returnList;
@@ -90,93 +85,85 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 构建前端所需要下拉树结构
-     * 
+     *
      * @param depts 部门列表
      * @return 下拉树结构列表
      */
     @Override
-    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts)
-    {
+    public List<TreeSelect> buildDeptTreeSelect(List<SysDept> depts) {
         List<SysDept> deptTrees = buildDeptTree(depts);
         return deptTrees.stream().map(TreeSelect::new).collect(Collectors.toList());
     }
 
     /**
      * 根据角色ID查询部门树信息
-     * 
+     *
      * @param roleId 角色ID
      * @return 选中部门列表
      */
     @Override
-    public List<Long> selectDeptListByRoleId(Long roleId)
-    {
+    public List<Long> selectDeptListByRoleId(Long roleId) {
         SysRole role = roleMapper.selectRoleById(roleId);
         return deptMapper.selectDeptListByRoleId(roleId, role.isDeptCheckStrictly());
     }
 
     /**
      * 根据部门ID查询信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 部门信息
      */
     @Override
-    public SysDept selectDeptById(Long deptId)
-    {
+    public SysDept selectDeptById(Long deptId) {
         return deptMapper.selectDeptById(deptId);
     }
 
     /**
      * 根据ID查询所有子部门（正常状态）
-     * 
+     *
      * @param deptId 部门ID
      * @return 子部门数
      */
     @Override
-    public int selectNormalChildrenDeptById(Long deptId)
-    {
+    public int selectNormalChildrenDeptById(Long deptId) {
         return deptMapper.selectNormalChildrenDeptById(deptId);
     }
 
     /**
      * 是否存在子节点
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
     @Override
-    public boolean hasChildByDeptId(Long deptId)
-    {
+    public boolean hasChildByDeptId(Long deptId) {
         int result = deptMapper.hasChildByDeptId(deptId);
         return result > 0;
     }
 
     /**
      * 查询部门是否存在用户
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果 true 存在 false 不存在
      */
     @Override
-    public boolean checkDeptExistUser(Long deptId)
-    {
+    public boolean checkDeptExistUser(Long deptId) {
         int result = deptMapper.checkDeptExistUser(deptId);
         return result > 0;
     }
 
     /**
      * 校验部门名称是否唯一
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
     @Override
-    public boolean checkDeptNameUnique(SysDept dept)
-    {
+    public boolean checkDeptNameUnique(SysDept dept) {
         Long deptId = StringUtils.isNull(dept.getDeptId()) ? -1L : dept.getDeptId();
         SysDept info = deptMapper.checkDeptNameUnique(dept.getDeptName(), dept.getParentId());
-        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getDeptId().longValue() != deptId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -184,19 +171,16 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 校验部门是否有数据权限
-     * 
+     *
      * @param deptId 部门id
      */
     @Override
-    public void checkDeptDataScope(Long deptId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
+    public void checkDeptDataScope(Long deptId) {
+        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysDept dept = new SysDept();
             dept.setDeptId(deptId);
             List<SysDept> depts = SpringUtils.getAopProxy(this).selectDeptList(dept);
-            if (StringUtils.isEmpty(depts))
-            {
+            if (StringUtils.isEmpty(depts)) {
                 throw new ServiceException("没有权限访问部门数据！");
             }
         }
@@ -204,36 +188,33 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 新增保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
     @Override
-    public int insertDept(SysDept dept)
-    {
+    public int insertDept(SysDept dept) {
         SysDept info = deptMapper.selectDeptById(dept.getParentId());
         // 如果父节点不为正常状态,则不允许新增子节点
-        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus()))
-        {
+        if (!UserConstants.DEPT_NORMAL.equals(info.getStatus())) {
             throw new ServiceException("部门停用，不允许新增");
         }
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
+        dept.setDeptId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         return deptMapper.insertDept(dept);
     }
 
     /**
      * 修改保存部门信息
-     * 
+     *
      * @param dept 部门信息
      * @return 结果
      */
     @Override
-    public int updateDept(SysDept dept)
-    {
+    public int updateDept(SysDept dept) {
         SysDept newParentDept = deptMapper.selectDeptById(dept.getParentId());
         SysDept oldDept = deptMapper.selectDeptById(dept.getDeptId());
-        if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept))
-        {
+        if (StringUtils.isNotNull(newParentDept) && StringUtils.isNotNull(oldDept)) {
             String newAncestors = newParentDept.getAncestors() + "," + newParentDept.getDeptId();
             String oldAncestors = oldDept.getAncestors();
             dept.setAncestors(newAncestors);
@@ -241,8 +222,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         }
         int result = deptMapper.updateDept(dept);
         if (UserConstants.DEPT_NORMAL.equals(dept.getStatus()) && StringUtils.isNotEmpty(dept.getAncestors())
-                && !StringUtils.equals("0", dept.getAncestors()))
-        {
+                && !StringUtils.equals("0", dept.getAncestors())) {
             // 如果该部门是启用状态，则启用该部门的所有上级部门
             updateParentDeptStatusNormal(dept);
         }
@@ -251,11 +231,10 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 修改该部门的父级部门状态
-     * 
+     *
      * @param dept 当前部门
      */
-    private void updateParentDeptStatusNormal(SysDept dept)
-    {
+    private void updateParentDeptStatusNormal(SysDept dept) {
         String ancestors = dept.getAncestors();
         Long[] deptIds = Convert.toLongArray(ancestors);
         deptMapper.updateDeptStatusNormal(deptIds);
@@ -263,48 +242,41 @@ public class SysDeptServiceImpl implements ISysDeptService
 
     /**
      * 修改子元素关系
-     * 
-     * @param deptId 被修改的部门ID
+     *
+     * @param deptId       被修改的部门ID
      * @param newAncestors 新的父ID集合
      * @param oldAncestors 旧的父ID集合
      */
-    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors)
-    {
+    public void updateDeptChildren(Long deptId, String newAncestors, String oldAncestors) {
         List<SysDept> children = deptMapper.selectChildrenDeptById(deptId);
-        for (SysDept child : children)
-        {
+        for (SysDept child : children) {
             child.setAncestors(child.getAncestors().replaceFirst(oldAncestors, newAncestors));
         }
-        if (children.size() > 0)
-        {
+        if (children.size() > 0) {
             deptMapper.updateDeptChildren(children);
         }
     }
 
     /**
      * 删除部门管理信息
-     * 
+     *
      * @param deptId 部门ID
      * @return 结果
      */
     @Override
-    public int deleteDeptById(Long deptId)
-    {
+    public int deleteDeptById(Long deptId) {
         return deptMapper.deleteDeptById(deptId);
     }
 
     /**
      * 递归列表
      */
-    private void recursionFn(List<SysDept> list, SysDept t)
-    {
+    private void recursionFn(List<SysDept> list, SysDept t) {
         // 得到子节点列表
         List<SysDept> childList = getChildList(list, t);
         t.setChildren(childList);
-        for (SysDept tChild : childList)
-        {
-            if (hasChild(list, tChild))
-            {
+        for (SysDept tChild : childList) {
+            if (hasChild(list, tChild)) {
                 recursionFn(list, tChild);
             }
         }
@@ -313,15 +285,12 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 得到子节点列表
      */
-    private List<SysDept> getChildList(List<SysDept> list, SysDept t)
-    {
+    private List<SysDept> getChildList(List<SysDept> list, SysDept t) {
         List<SysDept> tlist = new ArrayList<SysDept>();
         Iterator<SysDept> it = list.iterator();
-        while (it.hasNext())
-        {
+        while (it.hasNext()) {
             SysDept n = (SysDept) it.next();
-            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue())
-            {
+            if (StringUtils.isNotNull(n.getParentId()) && n.getParentId().longValue() == t.getDeptId().longValue()) {
                 tlist.add(n);
             }
         }
@@ -331,8 +300,7 @@ public class SysDeptServiceImpl implements ISysDeptService
     /**
      * 判断是否有子节点
      */
-    private boolean hasChild(List<SysDept> list, SysDept t)
-    {
+    private boolean hasChild(List<SysDept> list, SysDept t) {
         return getChildList(list, t).size() > 0;
     }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysPostServiceImpl.java

@@ -1,6 +1,12 @@
 package com.ruoyi.system.service.impl;
 
 import java.util.List;
+import java.util.stream.Collectors;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
+import com.ruoyi.common.exception.base.BaseException;
+import com.ruoyi.common.utils.SecurityUtils;
+import com.ruoyi.system.domain.UserPostAuthority;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import com.ruoyi.common.constant.UserConstants;
@@ -10,15 +16,15 @@ import com.ruoyi.system.domain.SysPost;
 import com.ruoyi.system.mapper.SysPostMapper;
 import com.ruoyi.system.mapper.SysUserPostMapper;
 import com.ruoyi.system.service.ISysPostService;
+import org.springframework.util.CollectionUtils;
 
 /**
  * 岗位信息 服务层处理
- * 
+ *
  * @author ruoyi
  */
 @Service
-public class SysPostServiceImpl implements ISysPostService
-{
+public class SysPostServiceImpl implements ISysPostService {
     @Autowired
     private SysPostMapper postMapper;
 
@@ -27,64 +33,58 @@ public class SysPostServiceImpl implements ISysPostService
 
     /**
      * 查询岗位信息集合
-     * 
+     *
      * @param post 岗位信息
      * @return 岗位信息集合
      */
     @Override
-    public List<SysPost> selectPostList(SysPost post)
-    {
+    public List<SysPost> selectPostList(SysPost post) {
         return postMapper.selectPostList(post);
     }
 
     /**
      * 查询所有岗位
-     * 
+     *
      * @return 岗位列表
      */
     @Override
-    public List<SysPost> selectPostAll()
-    {
+    public List<SysPost> selectPostAll() {
         return postMapper.selectPostAll();
     }
 
     /**
      * 通过岗位ID查询岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 角色对象信息
      */
     @Override
-    public SysPost selectPostById(Long postId)
-    {
+    public SysPost selectPostById(Long postId) {
         return postMapper.selectPostById(postId);
     }
 
     /**
      * 根据用户ID获取岗位选择框列表
-     * 
+     *
      * @param userId 用户ID
      * @return 选中岗位ID列表
      */
     @Override
-    public List<Long> selectPostListByUserId(Long userId)
-    {
+    public List<Long> selectPostListByUserId(Long userId) {
         return postMapper.selectPostListByUserId(userId);
     }
 
     /**
      * 校验岗位名称是否唯一
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
     @Override
-    public boolean checkPostNameUnique(SysPost post)
-    {
+    public boolean checkPostNameUnique(SysPost post) {
         Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
         SysPost info = postMapper.checkPostNameUnique(post.getPostName());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -92,17 +92,15 @@ public class SysPostServiceImpl implements ISysPostService
 
     /**
      * 校验岗位编码是否唯一
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
     @Override
-    public boolean checkPostCodeUnique(SysPost post)
-    {
+    public boolean checkPostCodeUnique(SysPost post) {
         Long postId = StringUtils.isNull(post.getPostId()) ? -1L : post.getPostId();
         SysPost info = postMapper.checkPostCodeUnique(post.getPostCode());
-        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getPostId().longValue() != postId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -110,42 +108,37 @@ public class SysPostServiceImpl implements ISysPostService
 
     /**
      * 通过岗位ID查询岗位使用数量
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
     @Override
-    public int countUserPostById(Long postId)
-    {
+    public int countUserPostById(Long postId) {
         return userPostMapper.countUserPostById(postId);
     }
 
     /**
      * 删除岗位信息
-     * 
+     *
      * @param postId 岗位ID
      * @return 结果
      */
     @Override
-    public int deletePostById(Long postId)
-    {
+    public int deletePostById(Long postId) {
         return postMapper.deletePostById(postId);
     }
 
     /**
      * 批量删除岗位信息
-     * 
+     *
      * @param postIds 需要删除的岗位ID
      * @return 结果
      */
     @Override
-    public int deletePostByIds(Long[] postIds)
-    {
-        for (Long postId : postIds)
-        {
+    public int deletePostByIds(Long[] postIds) {
+        for (Long postId : postIds) {
             SysPost post = selectPostById(postId);
-            if (countUserPostById(postId) > 0)
-            {
+            if (countUserPostById(postId) > 0) {
                 throw new ServiceException(String.format("%1$s已分配,不能删除", post.getPostName()));
             }
         }
@@ -154,30 +147,30 @@ public class SysPostServiceImpl implements ISysPostService
 
     /**
      * 新增保存岗位信息
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
     @Override
-    public int insertPost(SysPost post)
-    {
+    public int insertPost(SysPost post) {
+        post.setPostId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         return postMapper.insertPost(post);
     }
 
     /**
      * 修改保存岗位信息
-     * 
+     *
      * @param post 岗位信息
      * @return 结果
      */
     @Override
-    public int updatePost(SysPost post)
-    {
+    public int updatePost(SysPost post) {
         return postMapper.updatePost(post);
     }
 
     /**
      * 根据部门查询岗位
+     *
      * @param deptId
      * @return
      */
@@ -185,4 +178,40 @@ public class SysPostServiceImpl implements ISysPostService
     public SysPost selectPostByDeptId(Long deptId) {
         return postMapper.selectPostByDeptId(deptId);
     }
+
+    /**
+     * 查询部门经理级别岗位下的人员列表
+     *
+     * @param deptId    部门ID
+     * @param postLevel 岗位级别
+     * @return
+     */
+    @Override
+    public List<UserPostAuthority> userPostAuthorityList(Long deptId, Integer postLevel) {
+
+        return postMapper.userPostAuthorityList(deptId, postLevel);
+    }
+
+    /**
+     * 当前登录用户是否为部门经理级别
+     *
+     * @param deptId 部门ID
+     * @return
+     */
+    @Override
+    public boolean userHaveAuthority(Long deptId) {
+        Integer postLevel = 1;//岗位级别：0-不设置；1-经理；
+        Long userId = SecurityUtils.getUserId();
+
+        // 判断岗位是否在权限范围内
+        List<UserPostAuthority> userPostAuthorityList = userPostAuthorityList(deptId, postLevel);
+        if (CollectionUtils.isEmpty(userPostAuthorityList)) {
+            return false;
+        }
+        List<Long> haveAuthorityUserList = userPostAuthorityList.stream().map(t -> t.getUserId()).collect(Collectors.toList());
+        if (haveAuthorityUserList.contains(userId)) {
+            return true;
+        }
+        return false;
+    }
 }

ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -4,6 +4,8 @@ import java.util.ArrayList;
 import java.util.List;
 import java.util.stream.Collectors;
 import javax.validation.Validator;
+
+import com.baomidou.mybatisplus.core.toolkit.IdWorker;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -36,8 +38,7 @@ import com.ruoyi.system.service.ISysUserService;
  * @author ruoyi
  */
 @Service
-public class SysUserServiceImpl implements ISysUserService
-{
+public class SysUserServiceImpl implements ISysUserService {
     private static final Logger log = LoggerFactory.getLogger(SysUserServiceImpl.class);
 
     @Autowired
@@ -69,8 +70,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUserList(SysUser user)
-    {
+    public List<SysUser> selectUserList(SysUser user) {
         return userMapper.selectUserList(user);
     }
 
@@ -82,8 +82,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectAllocatedList(SysUser user)
-    {
+    public List<SysUser> selectAllocatedList(SysUser user) {
         return userMapper.selectAllocatedList(user);
     }
 
@@ -95,8 +94,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @DataScope(deptAlias = "d", userAlias = "u")
-    public List<SysUser> selectUnallocatedList(SysUser user)
-    {
+    public List<SysUser> selectUnallocatedList(SysUser user) {
         return userMapper.selectUnallocatedList(user);
     }
 
@@ -107,8 +105,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserByUserName(String userName)
-    {
+    public SysUser selectUserByUserName(String userName) {
         return userMapper.selectUserByUserName(userName);
     }
 
@@ -119,8 +116,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 用户对象信息
      */
     @Override
-    public SysUser selectUserById(Long userId)
-    {
+    public SysUser selectUserById(Long userId) {
         return userMapper.selectUserById(userId);
     }
 
@@ -131,11 +127,9 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String selectUserRoleGroup(String userName)
-    {
+    public String selectUserRoleGroup(String userName) {
         List<SysRole> list = roleMapper.selectRolesByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
+        if (CollectionUtils.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
         return list.stream().map(SysRole::getRoleName).collect(Collectors.joining(","));
@@ -148,11 +142,9 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public String selectUserPostGroup(String userName)
-    {
+    public String selectUserPostGroup(String userName) {
         List<SysPost> list = postMapper.selectPostsByUserName(userName);
-        if (CollectionUtils.isEmpty(list))
-        {
+        if (CollectionUtils.isEmpty(list)) {
             return StringUtils.EMPTY;
         }
         return list.stream().map(SysPost::getPostName).collect(Collectors.joining(","));
@@ -165,12 +157,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean checkUserNameUnique(SysUser user)
-    {
+    public boolean checkUserNameUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkUserNameUnique(user.getUserName());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -183,12 +173,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public boolean checkPhoneUnique(SysUser user)
-    {
+    public boolean checkPhoneUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkPhoneUnique(user.getPhonenumber());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -201,12 +189,10 @@ public class SysUserServiceImpl implements ISysUserService
      * @return
      */
     @Override
-    public boolean checkEmailUnique(SysUser user)
-    {
+    public boolean checkEmailUnique(SysUser user) {
         Long userId = StringUtils.isNull(user.getUserId()) ? -1L : user.getUserId();
         SysUser info = userMapper.checkEmailUnique(user.getEmail());
-        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue())
-        {
+        if (StringUtils.isNotNull(info) && info.getUserId().longValue() != userId.longValue()) {
             return UserConstants.NOT_UNIQUE;
         }
         return UserConstants.UNIQUE;
@@ -218,10 +204,8 @@ public class SysUserServiceImpl implements ISysUserService
      * @param user 用户信息
      */
     @Override
-    public void checkUserAllowed(SysUser user)
-    {
-        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin())
-        {
+    public void checkUserAllowed(SysUser user) {
+        if (StringUtils.isNotNull(user.getUserId()) && user.isAdmin()) {
             throw new ServiceException("不允许操作超级管理员用户");
         }
     }
@@ -232,15 +216,12 @@ public class SysUserServiceImpl implements ISysUserService
      * @param userId 用户id
      */
     @Override
-    public void checkUserDataScope(Long userId)
-    {
-        if (!SysUser.isAdmin(SecurityUtils.getUserId()))
-        {
+    public void checkUserDataScope(Long userId) {
+        if (!SysUser.isAdmin(SecurityUtils.getUserId())) {
             SysUser user = new SysUser();
             user.setUserId(userId);
             List<SysUser> users = SpringUtils.getAopProxy(this).selectUserList(user);
-            if (StringUtils.isEmpty(users))
-            {
+            if (StringUtils.isEmpty(users)) {
                 throw new ServiceException("没有权限访问用户数据！");
             }
         }
@@ -254,8 +235,8 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int insertUser(SysUser user)
-    {
+    public int insertUser(SysUser user) {
+        user.setUserId(Long.parseLong(IdWorker.getIdStr().substring(4)));
         // 新增用户信息
         int rows = userMapper.insertUser(user);
         // 新增用户岗位关联
@@ -272,8 +253,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public boolean registerUser(SysUser user)
-    {
+    public boolean registerUser(SysUser user) {
         return userMapper.insertUser(user) > 0;
     }
 
@@ -285,8 +265,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int updateUser(SysUser user)
-    {
+    public int updateUser(SysUser user) {
         Long userId = user.getUserId();
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
@@ -302,13 +281,12 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 用户授权角色
      *
-     * @param userId 用户ID
+     * @param userId  用户ID
      * @param roleIds 角色组
      */
     @Override
     @Transactional
-    public void insertUserAuth(Long userId, Long[] roleIds)
-    {
+    public void insertUserAuth(Long userId, Long[] roleIds) {
         userRoleMapper.deleteUserRoleByUserId(userId);
         insertUserRole(userId, roleIds);
     }
@@ -320,8 +298,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserStatus(SysUser user)
-    {
+    public int updateUserStatus(SysUser user) {
         return userMapper.updateUser(user);
     }
 
@@ -332,8 +309,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int updateUserProfile(SysUser user)
-    {
+    public int updateUserProfile(SysUser user) {
         return userMapper.updateUser(user);
     }
 
@@ -341,12 +317,11 @@ public class SysUserServiceImpl implements ISysUserService
      * 修改用户头像
      *
      * @param userName 用户名
-     * @param avatar 头像地址
+     * @param avatar   头像地址
      * @return 结果
      */
     @Override
-    public boolean updateUserAvatar(String userName, String avatar)
-    {
+    public boolean updateUserAvatar(String userName, String avatar) {
         return userMapper.updateUserAvatar(userName, avatar) > 0;
     }
 
@@ -357,8 +332,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetPwd(SysUser user)
-    {
+    public int resetPwd(SysUser user) {
         return userMapper.updateUser(user);
     }
 
@@ -370,8 +344,7 @@ public class SysUserServiceImpl implements ISysUserService
      * @return 结果
      */
     @Override
-    public int resetUserPwd(String userName, String password)
-    {
+    public int resetUserPwd(String userName, String password) {
         return userMapper.resetUserPwd(userName, password);
     }
 
@@ -380,8 +353,7 @@ public class SysUserServiceImpl implements ISysUserService
      *
      * @param user 用户对象
      */
-    public void insertUserRole(SysUser user)
-    {
+    public void insertUserRole(SysUser user) {
         this.insertUserRole(user.getUserId(), user.getRoleIds());
     }
 
@@ -390,15 +362,12 @@ public class SysUserServiceImpl implements ISysUserService
      *
      * @param user 用户对象
      */
-    public void insertUserPost(SysUser user)
-    {
+    public void insertUserPost(SysUser user) {
         Long[] posts = user.getPostIds();
-        if (StringUtils.isNotEmpty(posts))
-        {
+        if (StringUtils.isNotEmpty(posts)) {
             // 新增用户与岗位管理
-            List<SysUserPost> list = new ArrayList<SysUserPost>(posts.length);
-            for (Long postId : posts)
-            {
+            List<SysUserPost> list = new ArrayList<>(posts.length);
+            for (Long postId : posts) {
                 SysUserPost up = new SysUserPost();
                 up.setUserId(user.getUserId());
                 up.setPostId(postId);
@@ -411,17 +380,14 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 新增用户角色信息
      *
-     * @param userId 用户ID
+     * @param userId  用户ID
      * @param roleIds 角色组
      */
-    public void insertUserRole(Long userId, Long[] roleIds)
-    {
-        if (StringUtils.isNotEmpty(roleIds))
-        {
+    public void insertUserRole(Long userId, Long[] roleIds) {
+        if (StringUtils.isNotEmpty(roleIds)) {
             // 新增用户与角色管理
             List<SysUserRole> list = new ArrayList<SysUserRole>(roleIds.length);
-            for (Long roleId : roleIds)
-            {
+            for (Long roleId : roleIds) {
                 SysUserRole ur = new SysUserRole();
                 ur.setUserId(userId);
                 ur.setRoleId(roleId);
@@ -439,8 +405,7 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserById(Long userId)
-    {
+    public int deleteUserById(Long userId) {
         // 删除用户与角色关联
         userRoleMapper.deleteUserRoleByUserId(userId);
         // 删除用户与岗位表
@@ -456,10 +421,8 @@ public class SysUserServiceImpl implements ISysUserService
      */
     @Override
     @Transactional
-    public int deleteUserByIds(Long[] userIds)
-    {
-        for (Long userId : userIds)
-        {
+    public int deleteUserByIds(Long[] userIds) {
+        for (Long userId : userIds) {
             checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
         }
@@ -473,16 +436,14 @@ public class SysUserServiceImpl implements ISysUserService
     /**
      * 导入用户数据
      *
-     * @param userList 用户数据列表
+     * @param userList        用户数据列表
      * @param isUpdateSupport 是否更新支持，如果已存在，则进行更新数据
-     * @param operName 操作用户
+     * @param operName        操作用户
      * @return 结果
      */
     @Override
-    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName)
-    {
-        if (StringUtils.isNull(userList) || userList.size() == 0)
-        {
+    public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName) {
+        if (StringUtils.isNull(userList) || userList.size() == 0) {
             throw new ServiceException("导入用户数据不能为空！");
         }
         int successNum = 0;
@@ -490,23 +451,18 @@ public class SysUserServiceImpl implements ISysUserService
         StringBuilder successMsg = new StringBuilder();
         StringBuilder failureMsg = new StringBuilder();
         String password = configService.selectConfigByKey("sys.user.initPassword");
-        for (SysUser user : userList)
-        {
-            try
-            {
+        for (SysUser user : userList) {
+            try {
                 // 验证是否存在这个用户
                 SysUser u = userMapper.selectUserByUserName(user.getUserName());
-                if (StringUtils.isNull(u))
-                {
+                if (StringUtils.isNull(u)) {
                     BeanValidators.validateWithException(validator, user);
                     user.setPassword(SecurityUtils.encryptPassword(password));
                     user.setCreateBy(operName);
                     userMapper.insertUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 导入成功");
-                }
-                else if (isUpdateSupport)
-                {
+                } else if (isUpdateSupport) {
                     BeanValidators.validateWithException(validator, user);
                     checkUserAllowed(u);
                     checkUserDataScope(u.getUserId());
@@ -515,28 +471,21 @@ public class SysUserServiceImpl implements ISysUserService
                     userMapper.updateUser(user);
                     successNum++;
                     successMsg.append("<br/>" + successNum + "、账号 " + user.getUserName() + " 更新成功");
-                }
-                else
-                {
+                } else {
                     failureNum++;
                     failureMsg.append("<br/>" + failureNum + "、账号 " + user.getUserName() + " 已存在");
                 }
-            }
-            catch (Exception e)
-            {
+            } catch (Exception e) {
                 failureNum++;
                 String msg = "<br/>" + failureNum + "、账号 " + user.getUserName() + " 导入失败：";
                 failureMsg.append(msg + e.getMessage());
                 log.error(msg, e);
             }
         }
-        if (failureNum > 0)
-        {
+        if (failureNum > 0) {
             failureMsg.insert(0, "很抱歉，导入失败！共 " + failureNum + " 条数据格式不正确，错误如下：");
             throw new ServiceException(failureMsg.toString());
-        }
-        else
-        {
+        } else {
             successMsg.insert(0, "恭喜您，数据已全部导入成功！共 " + successNum + " 条，数据如下：");
         }
         return successMsg.toString();
@@ -553,6 +502,6 @@ public class SysUserServiceImpl implements ISysUserService
     @Override
     public List<SysUser> postUserList(Long deptId, String postName) {
 
-        return userMapper.postUserList(deptId,postName);
+        return userMapper.postUserList(deptId, postName);
     }
 }

ruoyi-system/src/main/resources/mapper/system/SysPostMapper.xml

@@ -136,4 +136,24 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 		where p.dept_id = #{deptId}
 	</select>
 
+
+	<select id="userPostAuthorityList"  resultType="UserPostAuthority">
+		SELECT
+			su."user_id" as userId,
+			su."user_name" as userName,
+			su."nick_name" as nickName,
+			sp."post_id" as postId,
+			sp."post_code" as postCode,
+			sp."post_name" as postName,
+			sp."post_level" as postLevel
+		FROM sys_post sp
+		INNER JOIN "sys_dept" sd ON  sd."dept_id" = sp."dept_id"
+		INNER JOIN "sys_user_post" sup ON sup."post_id" = sp."post_id"
+		INNER JOIN "public"."sys_users" su  ON su."user_id"  = sup."user_id"
+		WHERE sd."dept_id" = #{dept_id}
+		<if test="postLevel != null">
+			AND sp."post_level" = #{postLevel}
+		</if>
+	</select>
+
 </mapper>