删除用户管理员判断取消

purchase-admin/src/main/java/com/ozs/web/controller/home/SystemHomepageController.java

@@ -1,26 +1,15 @@
 package com.ozs.web.controller.home;
 
-import com.github.pagehelper.PageInfo;
 import com.ozs.common.core.controller.BaseController;
 import com.ozs.common.core.domain.AjaxResult;
-import com.ozs.common.core.domain.model.LoginUser;
-import com.ozs.common.utils.poi.ExcelUtil;
-import com.ozs.framework.web.service.TokenService;
-import com.ozs.plan.doman.PlanYears;
-import com.ozs.plan.doman.vo.requestVo.PlanYearsStandardVo;
 import com.ozs.plan.service.PlanYearsService;
 import io.swagger.annotations.ApiOperation;
-import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
-import org.springframework.web.multipart.MultipartFile;
 
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-import java.util.List;
+import javax.annotation.Resource;
+
 
 /**
  * 系统首页控制层
@@ -30,65 +19,65 @@ import java.util.List;
 @RestController
 @RequestMapping("/home/systemHomepage")
 public class SystemHomepageController extends BaseController {
-    @Autowired
+    @Resource
     private PlanYearsService planYearsService;
 
     @ApiOperation(value = "需求单位首页计划管理总数")
-    @PostMapping("/demandUnit/planManagement/total")
+    @GetMapping("/demandUnit/planManagement/total")
     public AjaxResult demandUnitPlanManagementTotal() {
         return planYearsService.demandUnitPlanManagementTotal();
     }
 
     @ApiOperation(value = "采购管理部门首页计划管理总数")
-    @PostMapping("/purchasingManagement/planManagement/total")
+    @GetMapping("/purchasingManagement/planManagement/total")
     public AjaxResult purchasingManagementPurchasingManagementTotal() {
         return planYearsService.purchasingManagementPurchasingManagementTotal();
     }
 
     @ApiOperation(value = "需求单位首页需求管理总数")
-    @PostMapping("/demandUnit/demandManagement/total")
+    @GetMapping("/demandUnit/demandManagement/total")
     public AjaxResult demandUnitDemandManagementTotal() {
         return planYearsService.demandUnitDemandManagementTotal();
     }
 
     @ApiOperation(value = "采购管理部门首页需求管理总数")
-    @PostMapping("/purchasingManagement/demandManagement/total")
+    @GetMapping("/purchasingManagement/demandManagement/total")
     public AjaxResult purchasingManagementDemandManagementTotal() {
         return planYearsService.purchasingManagementDemandManagementTotal();
     }
 
     @ApiOperation(value = "需求单位首页合同管理总数")
-    @PostMapping("/demandUnit/contractManagement/total")
+    @GetMapping("/demandUnit/contractManagement/total")
     public AjaxResult demandUnitContractManagementTotal() {
         return planYearsService.demandUnitContractManagementTotal();
     }
 
     @ApiOperation(value = "需求单位首页建设管理总数")
-    @PostMapping("/demandUnit/constructionManagement/total")
+    @GetMapping("/demandUnit/constructionManagement/total")
     public AjaxResult demandUnitConstructionManagementTotal() {
         return planYearsService.demandUnitConstructionManagementTotal();
     }
 
     @ApiOperation(value = "采购管理部门首页任务下达管理总数")
-    @PostMapping("/purchasingManagement/taskRelease/total")
+    @GetMapping("/purchasingManagement/taskRelease/total")
     public AjaxResult purchasingManagementTaskReleaseTotal() {
         return planYearsService.purchasingManagementTaskReleaseTotal();
     }
 
     @ApiOperation(value = "采购办首页采购执行管理总数")
-    @PostMapping("/procurementOffice/procurementExecution/total")
+    @GetMapping("/procurementOffice/procurementExecution/total")
     public AjaxResult procurementOfficeProcurementExecutionTotal() {
         return planYearsService.procurementOfficeProcurementExecutionTotal();
     }
 
     @ApiOperation(value = "采购办首已中标项目理总数")
-    @PostMapping("/procurementOffice/winningTheBid/total")
+    @GetMapping("/procurementOffice/winningTheBid/total")
     public AjaxResult procurementOfficeWinningTheBidTotal() {
         return planYearsService.procurementOfficeWinningTheBidTotal();
     }
 
     @ApiOperation(value = "采购办首未中标项目理总数")
-    @PostMapping("/procurementOffice/failureToWinTheBid/total")
+    @GetMapping("/procurementOffice/failureToWinTheBid/total")
     public AjaxResult procurementOfficeFailureToWinTheBidTotal() {
         return planYearsService.procurementOfficeFailureToWinTheBidTotal();
     }

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -540,13 +540,17 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                if (collect.size()==0){
+                    collect.add(-1L);
+                }
                 QueryWrapper<PlanYears> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PlanYears::getPurchaseDeptId, sysDept.getDeptId())
                         .eq(PlanYears::getIsExcess, IsExcess.NO_EXCESS.getCode()))
-                        .or(wrapper -> wrapper.lambda().in(PlanYears::getPurchaseDeptId, sysDepts)
+                        .or(wrapper -> wrapper.lambda().in(PlanYears::getPurchaseDeptId, collect)
                         .eq(PlanYears::getIsExcess, IsExcess.EXCESS.getCode()))
-                        .in("project_status",ProjectStatus.PLANWAIEXAMINE,ProjectStatus.PLANTOEXAMINE);
+                        .in("project_status",ProjectStatus.PLANWAIEXAMINE.getCode(),ProjectStatus.PLANTOEXAMINE.getCode());
                 planYears = planYearsMapper.selectList(queryWrapper);
             }
         } catch (Exception e) {
@@ -584,6 +588,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                if (collect.size()==0){
+                    collect.add(-1L);
+                }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
@@ -649,6 +657,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                if (collect.size()==0){
+                    collect.add(-1L);
+                }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
@@ -674,6 +686,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                if (collect.size()==0){
+                    collect.add(-1L);
+                }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
@@ -699,6 +715,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                if (collect.size()==0){
+                    collect.add(-1L);
+                }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())
@@ -724,6 +744,10 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                 SysUser sysUser = userService.selectUserById(SecurityUtils.getUserId());
                 SysDept sysDept = deptMapper.selectDeptById(sysUser.getDeptId());
                 List<SysDept> sysDepts = deptMapper.selectChildrenDeptById(sysDept.getDeptId());
+                List<Long> collect = sysDepts.stream().map(SysDept::getDeptId).collect(Collectors.toList());
+                if (collect.size()==0){
+                    collect.add(-1L);
+                }
                 QueryWrapper<PmDemand> queryWrapper = new QueryWrapper<>();
                 queryWrapper
                         .or(wrapper -> wrapper.lambda().eq(PmDemand::getPurchaseDeptId, sysDept.getDeptId())

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

@@ -462,7 +462,7 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
     {
         for (Long userId : userIds)
         {
-            checkUserAllowed(new SysUser(userId));
+//            checkUserAllowed(new SysUser(userId));
             checkUserDataScope(userId);
         }
         // 删除用户与角色关联