skjcmanager/skjcmanager-service-api/skjcmanager-sm-api/src/main/java/cn/gistack/sm/sg/DTO/ProjectSearchDTO.java
@@ -64,5 +64,8 @@ * 项目排序 0状态 ， 1进度 ，2注册码 */ private Integer projectSort; private String auditPerson; } skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/mapper/SgProgressReportMapper.xml
@@ -99,7 +99,7 @@ and userR.user_id = #{dto.userId} and userR.approval_order != 0 </if> <if test="dto.approvalStatus != null and dto.approvalStatus ==0"> and userR.approval_status = 0 and report.audit_person = #{dto.userId} and (report."STATUS" = 0 or report."STATUS" = 1) and userR.approval_status = 0 and report.audit_person = #{dto.auditPerson} and (report."STATUS" = 0 or report."STATUS" = 1) </if> <if test="dto.approvalStatus != null and dto.approvalStatus ==1"> and userR.approval_status = 1 skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProgressReportServiceImpl.java
@@ -408,6 +408,7 @@ public Map<String, Long> countList(ProjectSearchDTO searchDTO) { Long userId = AuthUtil.getUserId(); searchDTO.setUserId(userId); searchDTO.setAuditPerson(userId.toString()); List<SgProgressReportVO> all = sgProgressReportMapper.queryList(searchDTO); searchDTO.setApprovalStatus(0); List<SgProgressReportVO> pending = sgProgressReportMapper.queryList(searchDTO); skjcmanager/skjcmanager-service/skjcmanager-sm/src/main/java/cn/gistack/sm/sg/service/impl/SgProjectPersonConfigServiceImpl.java
@@ -50,14 +50,14 @@ SgProjectPersonConfigDO old = projectPersonConfigMapper.selectById(id); boolean isReport = !new LambdaQueryChainWrapper<>(sgProgressReportMapper).eq(SgProgressReportDO::getProframId, old.getProgramId()).list().isEmpty(); if (Objects.isNull(userId)){ if (isReport){ /*if (isReport){ throw new ServiceException("此项目配置存在审批，不允许修改"); } }*/ projectPersonConfigMapper.deleteById(id); }else if (!old.getUserId().equals(sgProjectPersonConfigDO.getUserId())){ if (isReport){ /*if (isReport){ throw new ServiceException("此项目配置存在审批，不允许修改"); } }*/ projectPersonConfigMapper.updateById(sgProjectPersonConfigDO); } }
