审核列表添加查询条件-->部门id

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanQuarterController.java

@@ -127,7 +127,12 @@ public class PlanQuarterController extends BaseController {
             standardVo.setPageSize(null);
             LoginUser loginUser = tokenService.getLoginUser(request);
             standardVo.setCreated(String.valueOf(loginUser.getUserId()));
-            standardVo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
+            //前端没有选择部门id，就默认登录人的id
+            if (!ObjectUtils.isEmpty(vo.getDeptId())) {
+                standardVo.setPurchaseDeptId(String.valueOf(vo.getDeptId()));
+            } else {
+                standardVo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
+            }
             List<PlanQuarter> planYears = quarterService.queryPage(standardVo);
             if (!ObjectUtils.isEmpty(planYears) && !ObjectUtils.isEmpty(planYears.size())) {
                 planQuarterList = quarterServiceImpl.changeTo(planYears);

purchase-admin/src/main/java/com/ozs/web/controller/plan/PlanYearsController.java

@@ -136,7 +136,12 @@ public class PlanYearsController extends BaseController {
             standardVo.setPageNum(null);
             standardVo.setPageSize(null);
             LoginUser loginUser = tokenService.getLoginUser(request);
-            standardVo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
+            //前端没有选择部门id，就默认登录人的id
+            if (!ObjectUtils.isEmpty(vo.getDeptId())) {
+                standardVo.setPurchaseDeptId(String.valueOf(vo.getDeptId()));
+            } else {
+                standardVo.setPurchaseDeptId(String.valueOf(loginUser.getDeptId()));
+            }
             standardVo.setCreated(String.valueOf(loginUser.getUserId()));
             List<PlanYears> planYears = planYearsService.queryPage(standardVo);
             if (!ObjectUtils.isEmpty(planYears) && !ObjectUtils.isEmpty(planYears.size())) {

purchase-admin/src/main/java/com/ozs/web/controller/plan/ProvisionalPlanController.java

@@ -181,7 +181,12 @@ public class ProvisionalPlanController extends BaseController {
             standardVo.setPageSize(null);
             LoginUser loginUser = tokenService.getLoginUser(request);
             standardVo.setCreated(String.valueOf(loginUser.getUserId()));
-            standardVo.setPurchaseDeptId(loginUser.getDeptId());
+            //前端没有选择部门id，就默认登录人的id
+            if (!ObjectUtils.isEmpty(vo.getDeptId())) {
+                standardVo.setPurchaseDeptId(vo.getDeptId());
+            } else {
+                standardVo.setPurchaseDeptId(loginUser.getDeptId());
+            }
             List<ProvisionalPlan> provisionalPlans = provisionalPlanService.queryPage(standardVo);
             if (!ObjectUtils.isEmpty(provisionalPlans) && !ObjectUtils.isEmpty(provisionalPlans.size())) {
                 provisionalPlanList = provisionalPlanServiceImpl.changeTo(provisionalPlans);

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmDemandController.java

@@ -71,14 +71,15 @@ public class PmDemandController extends BaseController {
 //    @PreAuthorize("@ss.hasPermi('pm:demand:view')")  首页去除权限
     @Log(title = ModularConstans.demand, businessType = BusinessType.QUERY)
     public AjaxResult view(@RequestBody PmDemandReqVo pmDemandReqVo) {
-        if(pmDemandReqVo.getDemandId() == null){
+        if (pmDemandReqVo.getDemandId() == null) {
             return AjaxResult.error("demandId不能为空");
         }
-        if(StringUtils.isEmpty(pmDemandReqVo.getDetailType())){
+        if (StringUtils.isEmpty(pmDemandReqVo.getDetailType())) {
             return AjaxResult.error("详情的类型不能为空");
         }
-        return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType()));
+        return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(), pmDemandReqVo.getDetailType()));
     }
+
     /**
      * 获取回退下拉列表
      */
@@ -88,23 +89,24 @@ public class PmDemandController extends BaseController {
     @Log(title = ModularConstans.demand, businessType = BusinessType.QUERY)
     public AjaxResult getReturnList(@NotEmpty(message = "需求ID不能为空")
                                     @RequestParam(value = "demandId", required = true) Long demandId) {
-        List< Map<String,Integer>> list = new ArrayList<>();
+        List<Map<String, Integer>> list = new ArrayList<>();
         LambdaQueryWrapper<PmDemandHis> lambdaQueryWrapper = new LambdaQueryWrapper<>();
-        lambdaQueryWrapper.eq(PmDemandHis::getDemandId,demandId).orderByAsc(PmDemandHis::getReturnOrderNumber);
+        lambdaQueryWrapper.eq(PmDemandHis::getDemandId, demandId).orderByAsc(PmDemandHis::getReturnOrderNumber);
         List<PmDemandHis> pmDemandHisList = this.pmDemandHisService.list(lambdaQueryWrapper);
-        if(!ObjectUtils.isEmpty(pmDemandHisList)){
-            Map<String,Integer> map = new HashMap<>();
-            map.put("当前信息",0);
+        if (!ObjectUtils.isEmpty(pmDemandHisList)) {
+            Map<String, Integer> map = new HashMap<>();
+            map.put("当前信息", 0);
             list.add(map);
             for (PmDemandHis pmDemandHis : pmDemandHisList) {
-                Map<String,Integer> map2 = new HashMap<>();
-                map2.put("第" + pmDemandHis.getReturnOrderNumber() + "回退",pmDemandHis.getReturnOrderNumber());
+                Map<String, Integer> map2 = new HashMap<>();
+                map2.put("第" + pmDemandHis.getReturnOrderNumber() + "回退", pmDemandHis.getReturnOrderNumber());
                 list.add(map2);
             }
         }
 
         return success(list);
     }
+
     /**
      * 查看历史详情
      */
@@ -113,22 +115,23 @@ public class PmDemandController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:demand:viewHis')")
     @Log(title = ModularConstans.demand, businessType = BusinessType.QUERY)
     public AjaxResult viewHis(@RequestBody PmDemandReqVo pmDemandReqVo) {
-        if(pmDemandReqVo.getDemandId() == null){
+        if (pmDemandReqVo.getDemandId() == null) {
             return AjaxResult.error("demandId不能为空");
         }
-        if(ObjectUtils.isEmpty(pmDemandReqVo.getDetailType())){
+        if (ObjectUtils.isEmpty(pmDemandReqVo.getDetailType())) {
             return AjaxResult.error("详情的类型不能为空");
         }
-        if(ObjectUtils.isEmpty(pmDemandReqVo.getReturnOrderNumber())){
+        if (ObjectUtils.isEmpty(pmDemandReqVo.getReturnOrderNumber())) {
             return AjaxResult.error("回退序号不能为空");
         }
-        if(0 == pmDemandReqVo.getReturnOrderNumber()){
-            return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType()));
+        if (0 == pmDemandReqVo.getReturnOrderNumber()) {
+            return success(pmDemandService.selectPmDemandByDemandId(pmDemandReqVo.getDemandId(), pmDemandReqVo.getDetailType()));
         } else {
-            return success(pmDemandHisService.selectPmDemandHisByDemandId(pmDemandReqVo.getDemandId(),pmDemandReqVo.getDetailType(),pmDemandReqVo.getReturnOrderNumber()));
+            return success(pmDemandHisService.selectPmDemandHisByDemandId(pmDemandReqVo.getDemandId(), pmDemandReqVo.getDetailType(), pmDemandReqVo.getReturnOrderNumber()));
         }
 
     }
+
     /**
      * 需求建档
      */
@@ -173,7 +176,7 @@ public class PmDemandController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:demand:commit')")
     @Log(title = ModularConstans.demand, businessType = BusinessType.UPDATE)
     public AjaxResult commit(@RequestBody PmDemandReqVo pmDemandReqVo, HttpServletRequest request) {
-        if(pmDemandReqVo.getDemandId() == null){
+        if (pmDemandReqVo.getDemandId() == null) {
             return AjaxResult.error("demandId不能为空");
         }
 
@@ -190,7 +193,7 @@ public class PmDemandController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:demand:viewFlowChart')")
     @Log(title = ModularConstans.demand, businessType = BusinessType.QUERY)
     public AjaxResult viewFlowChart(@RequestBody PmDemandReqVo pmRequestVo) {
-        if(pmRequestVo.getDemandId() == null){
+        if (pmRequestVo.getDemandId() == null) {
             return AjaxResult.error("demandId不能为空");
         }
         return success(pmDemandService.viewFlowChart(pmRequestVo.getDemandId()));
@@ -206,7 +209,12 @@ public class PmDemandController extends BaseController {
     @Log(title = ModularConstans.demandExamine, businessType = BusinessType.QUERY)
     public AjaxResult examineList(@RequestBody PmDemandReqVo pmDemandReqVo) {
         pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
-        pmDemandReqVo.setDeptId(getDeptId());
+        //前端没有选择部门id，就默认登录人的id
+        if (!ObjectUtils.isEmpty(pmDemandReqVo.getDeptId())) {
+            pmDemandReqVo.setDeptId(pmDemandReqVo.getDeptId());
+        } else {
+            pmDemandReqVo.setDeptId(getDeptId());
+        }
         pmDemandReqVo.setUserId(getUserId());
         IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 1);
         return success(page);
@@ -217,10 +225,10 @@ public class PmDemandController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:examine:reviewTo')")
     @Log(title = ModularConstans.demandExamine, businessType = BusinessType.UPDATE)
     public AjaxResult reviewTo(@RequestBody PmDemandReqVo pmDemandReqVo, HttpServletRequest request) {
-        if(pmDemandReqVo.getDemandId() == null){
+        if (pmDemandReqVo.getDemandId() == null) {
             return AjaxResult.error("demandId不能为空");
         }
-        if(pmDemandReqVo.getSysFileRefs() == null || pmDemandReqVo.getSysFileRefs().size() == 0){
+        if (pmDemandReqVo.getSysFileRefs() == null || pmDemandReqVo.getSysFileRefs().size() == 0) {
             return AjaxResult.error("上传附件不能为空");
         }
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -233,10 +241,10 @@ public class PmDemandController extends BaseController {
     @PreAuthorize("@ss.hasPermi('pm:examine:reviewReturn')")
     @Log(title = ModularConstans.demandExamine, businessType = BusinessType.UPDATE)
     public AjaxResult reviewReturn(@RequestBody PmDemandReqVo pmDemandReqVo, HttpServletRequest request) {
-        if(pmDemandReqVo.getDemandId() == null){
+        if (pmDemandReqVo.getDemandId() == null) {
             return AjaxResult.error("demandId不能为空");
         }
-        if(StringUtils.isEmpty(pmDemandReqVo.getRefuseReason())){
+        if (StringUtils.isEmpty(pmDemandReqVo.getRefuseReason())) {
             return AjaxResult.error("退回原因不能为空");
         }
         LoginUser loginUser = tokenService.getLoginUser(request);

purchase-admin/src/main/java/com/ozs/web/controller/pm/PmTaskReleaseController.java

@@ -57,7 +57,12 @@ public class PmTaskReleaseController extends BaseController {
     @Log(title = ModularConstans.taskRelease, businessType = BusinessType.QUERY)
     public AjaxResult list(@RequestBody PmDemandReqVo pmDemandReqVo) {
         pmDemandReqVo.setIsAdmin(SysUser.isAdmin(getUserId()));
-        pmDemandReqVo.setDeptId(getDeptId());
+        //前端没有选择部门id，就默认登录人的id
+        if (!ObjectUtils.isEmpty(pmDemandReqVo.getDeptId())) {
+            pmDemandReqVo.setDeptId(pmDemandReqVo.getDeptId());
+        } else {
+            pmDemandReqVo.setDeptId(getDeptId());
+        }
         pmDemandReqVo.setUserId(getUserId());
         IPage<PmDemandResVo> page = pmDemandService.selectPmDemandList(pmDemandReqVo, 2);
         return success(page);

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanQuarterStandardVo.java

@@ -36,7 +36,10 @@ public class PlanQuarterStandardVo extends PageVo {
     @Excel(name = "采购单位")
     @ApiModelProperty(value = "采购单位")
     private String purchaseDeptId;
-
+    /**
+     * 部门ID
+     */
+    private Long deptId;
     /**
      * 项目名称
      */

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/PlanYearsStandardVo.java

@@ -34,6 +34,10 @@ public class PlanYearsStandardVo extends PageVo {
     @Excel(name = "采购单位")
     @ApiModelProperty(value = "采购单位")
     private String purchaseDeptId;
+    /**
+     * 部门ID
+     */
+    private Long deptId;
 
     /**
      * 项目名称

purchase-system/src/main/java/com/ozs/plan/doman/vo/requestVo/ProvisionalPlanVo.java

@@ -45,6 +45,10 @@ public class ProvisionalPlanVo extends PageVo {
     @NotNull(message = "采购单位不能为空")
     @ApiModelProperty(value = "采购单位（登录账号的单位）")
     private Long purchaseDeptId;
+    /**
+     * 部门ID
+     */
+    private Long deptId;
 
     @NotNull(message = "项目名称不能为空")
     @ApiModelProperty(value = "项目名称")

purchase-system/src/main/java/com/ozs/pm/service/impl/PmDemandServiceImpl.java

@@ -596,14 +596,17 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         l.eq(PmAuditDeptRef::getRefType, "2");
         list = pmAuditDeptRefService.list(l);
         if (!pmDemandReqVo.getIsAdmin()) {
-            if (Arrays.asList(1, 2).contains(reqType)) {
+            if (1 == reqType) {
                 if (!ObjectUtils.isEmpty(list)) {
                     lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toSet()));
                 }
-                //采购执行管理中，本单位超额项目交给上级处理，本单位不处理。
+            } else if (2 == reqType) {
+                lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toSet()));
+                lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
             } else if (3 == reqType) {
+                //采购执行管理中，本单位超额项目交给上级处理，本单位不处理。
                 if (!ObjectUtils.isEmpty(list)) {
-                    // 如果有上级单位存在，将本单位剔除
+                    // 如果有上级单位存在，本单位不处理
                     SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                     //本单位所有参与审核的项目id
                     Set<Long> refList = new HashSet<>();