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

This commit is contained in:
yjz
2024-01-11 10:28:16 +08:00
parent 8462d29021
commit 6be003d38e
3 changed files with 145 additions and 91 deletions
@@ -1,5 +1,6 @@
package com.jero.modules.activiti.process.espermissionapply.controller; package com.jero.modules.activiti.process.espermissionapply.controller;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.jero.common.api.vo.Result; import com.jero.common.api.vo.Result;
import com.jero.common.aspect.annotation.AutoLog; 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.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; 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.Api;
import io.swagger.annotations.ApiOperation; import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
@@ -25,7 +28,7 @@ import java.util.List;
import java.util.Map; import java.util.Map;
/** /**
* @Description: 权限申请流程业务表 * @Description: 权限申请流程业务表
* @Author: jero-boot * @Author: jero-boot
* @Date: 2023-11-29 * @Date: 2023-11-29
@@ -38,6 +41,10 @@ import java.util.Map;
public class ProcessEsPermissionApplyController extends JeroController<ProcessEsPermissionApply, IProcessEsPermissionApplyService> { public class ProcessEsPermissionApplyController extends JeroController<ProcessEsPermissionApply, IProcessEsPermissionApplyService> {
@Autowired @Autowired
private IProcessEsPermissionApplyService processEsPermissionApplyService; private IProcessEsPermissionApplyService processEsPermissionApplyService;
@Autowired
private EnterpriseStandardAuthUserService enterpriseStandardAuthUserService;
@Autowired
private ILawsEnterpriseStandardService lawsEnterpriseStandardService;
/** /**
* 分页列表查询 * 分页列表查询
@@ -91,6 +98,19 @@ public class ProcessEsPermissionApplyController extends JeroController<ProcessEs
return Result.OK(list); return Result.OK(list);
} }
/**
* 添加
*
* @param jsonObject
* @return
*/
@AutoLog(value = "权限申请流程业务表-权限校验")
@ApiOperation(value="权限申请流程业务表-权限校验", notes="权限申请流程业务表-权限校验")
@PostMapping(value = "/permissionCheck")
public Result<T> permissionCheck(@Validated @RequestBody JSONObject jsonObject) {
return processEsPermissionApplyService.permissionCheck(jsonObject);
}
/** /**
* 添加 * 添加
* *
@@ -1,11 +1,14 @@
package com.jero.modules.activiti.process.espermissionapply.service; package com.jero.modules.activiti.process.espermissionapply.service;
import com.alibaba.fastjson.JSONObject;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.service.IService; 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.entity.ProcessEsPermissionApply;
import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO; import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBox; import com.jero.modules.laws.common.vo.ManyStandardSelectionBox;
import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO; import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
import org.apache.poi.ss.formula.functions.T;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.List; import java.util.List;
@@ -93,4 +96,11 @@ public interface IProcessEsPermissionApplyService extends IService<ProcessEsPerm
* @return * @return
*/ */
IPage<ManyStandardSelectionBox> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize); IPage<ManyStandardSelectionBox> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize);
/**
* 权限申请流程业务表-权限校验
* @param jsonObject
* @return
*/
Result<T> permissionCheck(JSONObject jsonObject);
} }
@@ -1,13 +1,17 @@
package com.jero.modules.activiti.process.espermissionapply.service.impl; 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.LambdaQueryWrapper;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper; import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.core.metadata.IPage; import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page; import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl; 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.exception.JeroBootException;
import com.jero.common.system.query.QueryGenerator; import com.jero.common.system.query.QueryGenerator;
import com.jero.common.system.vo.LoginUser; 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.entity.ProcessEsPermissionApply;
import com.jero.modules.activiti.process.espermissionapply.mapper.ProcessEsPermissionApplyMapper; import com.jero.modules.activiti.process.espermissionapply.mapper.ProcessEsPermissionApplyMapper;
import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService; 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.laws.standard.service.ILawsEnterpriseStandardService;
import com.jero.modules.system.service.ISysUserService; import com.jero.modules.system.service.ISysUserService;
import org.apache.commons.lang3.StringUtils; import org.apache.commons.lang3.StringUtils;
import org.apache.poi.ss.formula.functions.T;
import org.apache.shiro.SecurityUtils; import org.apache.shiro.SecurityUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@@ -203,4 +208,23 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPe
.collect(Collectors.toList())); .collect(Collectors.toList()));
return page; 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));
}
} }