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

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

@@ -7,6 +7,8 @@ import com.jero.common.system.base.controller.JeroController;
 import com.jero.modules.activiti.process.espermissionapply.entity.ProcessEsPermissionApply;
 import com.jero.modules.activiti.process.espermissionapply.service.IProcessEsPermissionApplyService;
 import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
+import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
@@ -57,6 +59,23 @@ public class ProcessEsPermissionApplyController extends JeroController<ProcessEs
 		return Result.OK(pageList);
 	}
 
+	 /**
+	  * 企标分页列表查询
+	  * @param manyStandardSelectionBoxVO
+	  * @param pageNo
+	  * @param pageSize
+	  * @return
+	  */
+	 @AutoLog(value = "权限申请流程业务表-企标分页列表查询")
+	 @ApiOperation(value="权限申请流程业务表-企标分页列表查询", notes="权限申请流程业务表-企标分页列表查询")
+	 @GetMapping(value = "/queryEnterpriseByPage")
+	 public Result<IPage<LawsEnterpriseStandard>> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO,
+																		@RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
+																		@RequestParam(name="pageSize", defaultValue="10") Integer pageSize) {
+		 IPage<LawsEnterpriseStandard> pageList = processEsPermissionApplyService.queryEnterpriseByPage(manyStandardSelectionBoxVO, pageNo, pageSize);
+		 return Result.OK(pageList);
+	 }
+
     /**
 	 * 列表查询
 	 *

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

@@ -4,6 +4,8 @@ import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.service.IService;
 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.ManyStandardSelectionBoxVO;
+import com.jero.modules.laws.standard.entity.LawsEnterpriseStandard;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.List;
@@ -82,4 +84,13 @@ public interface IProcessEsPermissionApplyService extends IService<ProcessEsPerm
 	 * @return
 	 */
     ProcessEsPermissionApplyVO queryByProjectId(String projectId);
+
+	/**
+	 * 权限申请流程业务表-企标分页列表查询
+	 * @param manyStandardSelectionBoxVO
+	 * @param pageNo
+	 * @param pageSize
+	 * @return
+	 */
+    IPage<LawsEnterpriseStandard> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize);
 }

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

@@ -7,20 +7,25 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.jero.common.exception.JeroBootException;
 import com.jero.common.system.query.QueryGenerator;
+import com.jero.common.system.vo.LoginUser;
 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;
 import com.jero.modules.activiti.process.espermissionapply.vo.ProcessEsPermissionApplyVO;
+import com.jero.modules.laws.common.vo.ManyStandardSelectionBoxVO;
+import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
 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.shiro.SecurityUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
 import javax.servlet.http.HttpServletRequest;
 import java.util.*;
+import java.util.stream.Collectors;
 
 
 /**
@@ -34,11 +39,14 @@ import java.util.*;
 public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPermissionApplyMapper, ProcessEsPermissionApply> implements IProcessEsPermissionApplyService {
 
 	private final ILawsEnterpriseStandardService lawsEnterpriseStandardService;
+	private final EnterpriseStandardAuthUserService enterpriseStandardAuthUserService;
 	private final ISysUserService sysUserService;
 
 	public ProcessEsPermissionApplyServiceImpl(ILawsEnterpriseStandardService lawsEnterpriseStandardService,
+											   EnterpriseStandardAuthUserService enterpriseStandardAuthUserService,
 											   ISysUserService sysUserService) {
 		this.lawsEnterpriseStandardService = lawsEnterpriseStandardService;
+		this.enterpriseStandardAuthUserService = enterpriseStandardAuthUserService;
 		this.sysUserService = sysUserService;
 	}
 
@@ -159,4 +167,33 @@ public class ProcessEsPermissionApplyServiceImpl extends ServiceImpl<ProcessEsPe
 		}
 		return processEsPermissionApplyVO;
 	}
+
+	@Override
+	public IPage<LawsEnterpriseStandard> queryEnterpriseByPage(ManyStandardSelectionBoxVO manyStandardSelectionBoxVO, Integer pageNo, Integer pageSize) {
+		LambdaQueryWrapper<LawsEnterpriseStandard> queryWrapper = new LambdaQueryWrapper<>();
+		if (StringUtils.isNotBlank(manyStandardSelectionBoxVO.getStandardNumberOrName())){
+			queryWrapper.and(qw ->
+					qw.like(LawsEnterpriseStandard::getStandardNumber, manyStandardSelectionBoxVO.getStandardNumberOrName())
+							.or().like(LawsEnterpriseStandard::getStandardName, manyStandardSelectionBoxVO.getStandardNumberOrName()));
+		}
+		queryWrapper.orderByDesc(LawsEnterpriseStandard::getCreateTime);
+		List<LawsEnterpriseStandard> list = lawsEnterpriseStandardService.list(queryWrapper);
+		List<LawsEnterpriseStandard> lawsEnterpriseStandardList = new ArrayList<>();
+		// 权限校验
+		LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+		for (LawsEnterpriseStandard lawsEnterpriseStandard : list) {
+			boolean b = enterpriseStandardAuthUserService.hasESAuth(loginUser.getId(), Collections.singletonList(lawsEnterpriseStandard.getId()));
+			if (b){
+				lawsEnterpriseStandardList.add(lawsEnterpriseStandard);
+			}
+		}
+		IPage<LawsEnterpriseStandard> page = new Page(pageNo ,pageSize);
+		page.setTotal(lawsEnterpriseStandardList.size());
+		page.setRecords(
+				lawsEnterpriseStandardList.stream()
+						.skip((long) (Math.max(1, pageNo) - 1) * pageSize)
+						.limit(pageSize)
+						.collect(Collectors.toList()));
+		return page;
+	}
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/EnterpriseStandardAuthUserService.java

@@ -67,4 +67,6 @@ public interface EnterpriseStandardAuthUserService extends IService<EnterpriseSt
      * @param authId
      */
     void revokeAuth(String authId);
+
+    boolean hasESAuth(String userId, List<String> standardIds);
 }

laws-modules/src/main/java/com/jero/modules/laws/enterprise/service/impl/EnterpriseStandardAuthUserServiceImpl.java

@@ -13,7 +13,6 @@ import com.jero.common.util.MessageUtils;
 import com.jero.modules.laws.common.constant.FieldCommon;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthDept;
 import com.jero.modules.laws.enterprise.entity.EnterpriseStandardAuthUser;
-import com.jero.modules.laws.enterprise.entity.vo.EnterpriseStandardRecheckPlanVo;
 import com.jero.modules.laws.enterprise.mapper.EnterpriseStandardAuthUserMapper;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthDeptService;
 import com.jero.modules.laws.enterprise.service.EnterpriseStandardAuthUserService;
@@ -264,6 +263,7 @@ public class EnterpriseStandardAuthUserServiceImpl extends ServiceImpl<Enterpris
 
     }
 
+    @Override
     public boolean hasESAuth(String userId, List<String> standardIds) {
         SysUser currentUser = sysUserService.getById(userId);
         // 管理员有所有企标的权限