DeBugDeBugDeBug

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

@@ -176,7 +176,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "提交季度计划")
     @PostMapping("/commit")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:commit')")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:commit')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult commit(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.commit(quarterStandardVo);
@@ -192,7 +192,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "根据id获取季度计划信息")
     @PostMapping("/view")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:view')")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:view')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.QUERY)
     public AjaxResult view(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.view(quarterStandardVo);
@@ -200,7 +200,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "审核季度计划通过")
     @PostMapping("/reviewTo")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:reviewTo')")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:reviewTo')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult reviewTo(@RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -210,7 +210,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "审核季度计划退回")
     @PostMapping("/reviewReturn")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:reviewReturn')")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:reviewReturn')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult reviewReturn(@RequestBody PlanQuarterStandardVo quarterStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);
@@ -252,7 +252,7 @@ public class PlanQuarterController extends BaseController {
 
     @ApiOperation(value = "发函催告")
     @PostMapping("/sendLetter")
-    @PreAuthorize("@ss.hasPermi('plan:quarter:sendLetter')")
+    //@PreAuthorize("@ss.hasPermi('plan:quarter:sendLetter')")
     @Log(title = ModularConstans.planQuarter, businessType = BusinessType.UPDATE)
     public AjaxResult sendLetter(@RequestBody PlanQuarterStandardVo quarterStandardVo) {
         return quarterService.sendLetter(quarterStandardVo);

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

@@ -236,7 +236,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "提交年度计划")
     @PostMapping("/commit")
-    @PreAuthorize("@ss.hasPermi('plan:planYears:commit')")
+    //@PreAuthorize("@ss.hasPermi('plan:planYears:commit')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult commit(@RequestBody PlanYearsStandardVo yearsStandardVo) {
         return planYearsService.commit(yearsStandardVo);
@@ -278,7 +278,7 @@ public class PlanYearsController extends BaseController {
 
     @ApiOperation(value = "审核年度计划退回")
     @PostMapping("/reviewReturn")
-    @PreAuthorize("@ss.hasPermi('plan:planYears:reviewReturn')")
+    //@PreAuthorize("@ss.hasPermi('plan:planYears:reviewReturn')")
     @Log(title = ModularConstans.planYear, businessType = BusinessType.UPDATE)
     public AjaxResult reviewReturn(@RequestBody PlanYearsStandardVo yearsStandardVo, HttpServletRequest request) {
         LoginUser loginUser = tokenService.getLoginUser(request);

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

@@ -3896,14 +3896,15 @@ public class PmDemandServiceImpl extends ServiceImpl<PmDemandMapper, PmDemand> i
         //  4 (合同信息管理)、 0(需求单位管理) 、 5(项目建设管理)  需求单位
         //  1(需求需求审核) 、2 (任务下达管理)      采购管理部门
         //  3(采购执行管理)   采购办
-        //List<PmAuditDeptRef> list = new ArrayList<>();
-        //LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
-        //l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
-        //l.eq(PmAuditDeptRef::getRefType, "2");
-        //list = pmAuditDeptRefService.list(l);
-        //if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
-        //    lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
-        //}
+        List<PmAuditDeptRef> list = new ArrayList<>();
+        LambdaQueryWrapper<PmAuditDeptRef> l = new LambdaQueryWrapper<>();
+        l.eq(PmAuditDeptRef::getDeptId, SecurityUtils.getDeptId());
+        l.eq(PmAuditDeptRef::getRefType, "2");
+        list = pmAuditDeptRefService.list(l);
+        if (!ObjectUtils.isEmpty(list) && !SecurityUtils.getUserId().equals(Integer.parseInt("1"))) {
+            lw.in(PmDemand::getDemandId, list.stream().map(PmAuditDeptRef::getRefId).collect(Collectors.toList()));
+        }
+
         lw.eq(PmDemand::getPurchaseDeptId, SecurityUtils.getDeptId());
         lw.last(" order by project_status, plan_demand_sub_time");
         List<PmDemand> demandList = this.baseMapper.selectList(lw);