fix(权限申请流程): ；79588

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/controller/ProcessEsPermissionApplyController.java

@@ -1,5 +1,6 @@
 package com.jero.modules.activiti.process.espermissionapply.controller;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.jero.common.api.vo.Result;
 import com.jero.common.aspect.annotation.AutoLog;
@@ -9,6 +10,8 @@ import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPer
 import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
 import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
 import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
+import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -25,7 +28,7 @@ import java.util.List;
 import java.util.Map;
 
 
- /**
+/**
  * @Description: 权限申请流程业务表
  * @Author: jero-boot
  * @Date:   2023-11-29
@@ -36,28 +39,32 @@ import java.util.Map;
 @RequestMapping("/espermissionapply/processEsPermissionApply")
 @Slf4j
 public class ProcessEsPermissionApplyController extends JeroController<ProcessEsPermissionApply, IProcessEsPermissionApplyService> {
-	@Autowired
+	 @Autowired
-	private IProcessEsPermissionApplyService processEsPermissionApplyService;
+	 private IProcessEsPermissionApplyService processEsPermissionApplyService;
+	 @Autowired
+	 private  EnterpriseStandardAuthUserService enterpriseStandardAuthUserService;
+	 @Autowired
+	 private ILawsEnterpriseStandardService lawsEnterpriseStandardService;
 
-	/**
+	 /**
-	 * 分页列表查询
+	  * 分页列表查询
-	 *
+	  *
-	 * @param processEsPermissionApply
+	  * @param processEsPermissionApply
-	 * @param pageNo
+	  * @param pageNo
-	 * @param pageSize
+	  * @param pageSize
-	 * @param req
+	  * @param req
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "权限申请流程业务表-分页列表查询")
+	 @AutoLog(value = "权限申请流程业务表-分页列表查询")
-	@ApiOperation(value="权限申请流程业务表-分页列表查询", notes="权限申请流程业务表-分页列表查询")
+	 @ApiOperation(value="权限申请流程业务表-分页列表查询", notes="权限申请流程业务表-分页列表查询")
-	@GetMapping(value = "/page")
+	 @GetMapping(value = "/page")
-	public Result<IPage<ProcessEsPermissionApply>> queryPageList(ProcessEsPermissionApply processEsPermissionApply,
+	 public Result<IPage<ProcessEsPermissionApply>> queryPageList(ProcessEsPermissionApply processEsPermissionApply,
-																 @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																  @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
-																 @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
+																  @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
-																 HttpServletRequest req) {
+																  HttpServletRequest req) {
-		IPage<ProcessEsPermissionApply> pageList = processEsPermissionApplyService.queryPage(processEsPermissionApply, pageNo, pageSize, req);
+		 IPage<ProcessEsPermissionApply> pageList = processEsPermissionApplyService.queryPage(processEsPermissionApply, pageNo, pageSize, req);
-		return Result.OK(pageList);
+		 return Result.OK(pageList);
-	}
+	 }
 
 	 /**
 	  * 企标分页列表查询
@@ -91,84 +98,97 @@ public class ProcessEsPermissionApplyController extends JeroController<ProcessEs
         return Result.OK(list);
 	}
 
-	/**
+	 /**
-	 *   添加
+	  *   添加
-	 *
+	  *
-	 * @param processEsPermissionApply
+	  * @param jsonObject
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "权限申请流程业务表-添加")
+	 @AutoLog(value = "权限申请流程业务表-权限校验")
-	@ApiOperation(value="权限申请流程业务表-添加", notes="权限申请流程业务表-添加")
+	 @ApiOperation(value="权限申请流程业务表-权限校验", notes="权限申请流程业务表-权限校验")
-	@PostMapping(value = "/add")
+	 @PostMapping(value = "/permissionCheck")
-	public Result<T> add(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) {
+	 public Result<T> permissionCheck(@Validated @RequestBody JSONObject jsonObject) {
-		processEsPermissionApplyService.add(processEsPermissionApply);
+		return processEsPermissionApplyService.permissionCheck(jsonObject);
-		return Result.OK("操作成功!");
+	 }
-	}
 
-	/**
+	 /**
-	 *  编辑
+	  *   添加
-	 *
+	  *
-	 * @param processEsPermissionApply
+	  * @param processEsPermissionApply
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "权限申请流程业务表-编辑")
+	 @AutoLog(value = "权限申请流程业务表-添加")
-	@ApiOperation(value="权限申请流程业务表-编辑", notes="权限申请流程业务表-编辑")
+	 @ApiOperation(value="权限申请流程业务表-添加", notes="权限申请流程业务表-添加")
-	@PostMapping(value = "/edit")
+	 @PostMapping(value = "/add")
-	public Result<T> edit(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) {
+	 public Result<T> add(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) {
-		processEsPermissionApplyService.editById(processEsPermissionApply);
+		 processEsPermissionApplyService.add(processEsPermissionApply);
-		return Result.OK("操作成功!");
+		 return Result.OK("操作成功!");
-	}
+	 }
 
-	/**
+	 /**
-	 *   通过id删除
+	  *  编辑
-	 *
+	  *
-	 * @param map
+	  * @param processEsPermissionApply
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "权限申请流程业务表-通过id删除")
+	 @AutoLog(value = "权限申请流程业务表-编辑")
-	@ApiOperation(value="权限申请流程业务表-通过id删除", notes="权限申请流程业务表-通过id删除")
+	 @ApiOperation(value="权限申请流程业务表-编辑", notes="权限申请流程业务表-编辑")
-	@PostMapping(value = "/delete")
+	 @PostMapping(value = "/edit")
-	public Result<T> delete(@RequestBody Map<String, String> map) {
+	 public Result<T> edit(@Validated @RequestBody ProcessEsPermissionApply processEsPermissionApply) {
-	    if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
+		 processEsPermissionApplyService.editById(processEsPermissionApply);
+		 return Result.OK("操作成功!");
+	 }
+
+	 /**
+	  *   通过id删除
+	  *
+	  * @param map
+	  * @return
+	  */
+	 @AutoLog(value = "权限申请流程业务表-通过id删除")
+	 @ApiOperation(value="权限申请流程业务表-通过id删除", notes="权限申请流程业务表-通过id删除")
+	 @PostMapping(value = "/delete")
+	 public Result<T> delete(@RequestBody Map<String, String> map) {
+		 if(!map.containsKey("id") || StringUtils.isEmpty(map.get("id"))){
             return Result.error("请选择数据!");
         }
-		processEsPermissionApplyService.deleteById(map.get("id"));
+		 processEsPermissionApplyService.deleteById(map.get("id"));
-		return Result.OK("删除成功!");
+		 return Result.OK("删除成功!");
-	}
+	 }
 
-	/**
+	 /**
-	 *  批量删除
+	  *  批量删除
-	 *
+	  *
-	 * @param map
+	  * @param map
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "权限申请流程业务表-批量删除")
+	 @AutoLog(value = "权限申请流程业务表-批量删除")
-	@ApiOperation(value="权限申请流程业务表-批量删除", notes="权限申请流程业务表-批量删除")
+	 @ApiOperation(value="权限申请流程业务表-批量删除", notes="权限申请流程业务表-批量删除")
-	@PostMapping(value = "/deleteBatch")
+	 @PostMapping(value = "/deleteBatch")
-	public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
+	 public Result<T> deleteBatch(@RequestBody Map<String, String> map) {
         if(!map.containsKey("ids") || StringUtils.isEmpty(map.get("ids"))){
 			return Result.error("请选择数据!");
 		}
-		this.processEsPermissionApplyService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
+		 this.processEsPermissionApplyService.deleteByIds(Arrays.asList(map.get("ids").split(",")));
-		return Result.OK("批量删除成功!");
+		 return Result.OK("批量删除成功!");
-	}
+	 }
 
-	/**
+	 /**
-	 * 通过id查询
+	  * 通过id查询
-	 *
+	  *
-	 * @param id
+	  * @param id
-	 * @return
+	  * @return
-	 */
+	  */
-	@AutoLog(value = "权限申请流程业务表-通过id查询")
+	 @AutoLog(value = "权限申请流程业务表-通过id查询")
-	@ApiOperation(value="权限申请流程业务表-通过id查询", notes="权限申请流程业务表-通过id查询")
+	 @ApiOperation(value="权限申请流程业务表-通过id查询", notes="权限申请流程业务表-通过id查询")
-	@GetMapping(value = "/queryById")
+	 @GetMapping(value = "/queryById")
-	public Result<ProcessEsPermissionApply> queryById(@RequestParam(name="id",required=true) String id) {
+	 public Result<ProcessEsPermissionApply> queryById(@RequestParam(name="id",required=true) String id) {
-		ProcessEsPermissionApply processEsPermissionApply = processEsPermissionApplyService.queryById(id);
+		 ProcessEsPermissionApply processEsPermissionApply = processEsPermissionApplyService.queryById(id);
-		if(processEsPermissionApply==null) {
+		 if(processEsPermissionApply==null) {
-			return Result.error("未找到对应数据");
+			 return Result.error("未找到对应数据");
-		}
+		 }
-		return Result.OK(processEsPermissionApply);
+		 return Result.OK(processEsPermissionApply);
-	}
+	 }
 
 	 /**
 	  * 通过项目id查询

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/IProcessEsPermissionApplyService.java

@@ -1,11 +1,14 @@
 package com.jero.modules.activiti.process.espermissionapply.service;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
+import com.jero.common.api.vo.Result;
 import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply;
 import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
 import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
 import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
+import org.apache.poi.ss.formula.functions.T;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -93,4 +96,11 @@ public interface IProcessEsPermissionApplyService extends IService<ProcessEsPerm
 	 * @return
 	 */
     IPage<ManyStandardSelectionBox> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize);
+
+	/**
+	 * 权限申请流程业务表-权限校验
+	 * @param jsonObject
+	 * @return
+	 */
+	Result<T> permissionCheck(JSONObject jsonObject);
 }

laws-modules/src/main/java/com/jero/modules/activiti/process/espermissionapply/service/impl/ProcessEsPermissionApplyServiceImpl.java

@@ -1,13 +1,17 @@
 package com.jero.modules.activiti.process.espermissionapply.service.impl;
 
+import com.alibaba.fastjson.JSONObject;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.jero.common.api.vo.Result;
+import com.jero.common.api.vo.ResultCommon;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
 import com.jero.common.system.vo.LoginUser;
+import com.jero.common.util.MessageUtils;
 import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply;
 import com.jero.modules.activiti.process.espermissionapply.mapper.ProcessEsPermissionApplyMapper;
 import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
@@ -19,6 +23,7 @@ import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import com.jero.modules.laws.standard.service.ILawsEnterpriseStandardService;
 import com.jero.modules.system.service.ISysUserService;
 import org.apache.commons.lang3.StringUtils;
+import org.apache.poi.ss.formula.functions.T;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
@@ -203,4 +208,23 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPe
 						.collect(Collectors.toList()));
 		return page;
 	}
+
+	@Override
+	public Result<T> permissionCheck(JSONObject jsonObject) {
+		String ids = String.valueOf(jsonObject.get("ids"));
+		List<String> list = Arrays.asList(ids.split(","));
+		List<LawsEnterpriseStandard> lawsEnterpriseStandardList = lawsEnterpriseStandardService.listByIds(list);
+		List<String> standardNameList = new ArrayList<>();
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		for (LawsEnterpriseStandard lawsEnterpriseStandard : lawsEnterpriseStandardList) {
+			boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId()));
+			if (b){
+				standardNameList.add(lawsEnterpriseStandard.getStandardName());
+			}
+		}
+		if (!standardNameList.isEmpty()){
+			return Result.error("企标编号为：" + String.join(",", standardNameList) + "已拥有权限，请重新选择没有权限的企标!");
+		}
+		return Result.OK(MessageUtils.getMessage(ResultCommon.OK));
+	}
 }