修改bug

research-system/src/main/java/com/research/system/service/impl/CooperatorServiceImpl.java

@@ -57,7 +57,14 @@ public class CooperatorServiceImpl implements CooperatorService {
 
     @Override
     public List<ClientPrjProjInfoVo.OrgVo> query(ClientPrjProOrgDto.Query dto) {
-        return prjProOrgDao.query(dto, SecurityUtils.getLoginUserOrNull() == null ? null :SecurityUtils.isAdmin(SecurityUtils.getLoginUserOrNull() == null? 0L : SecurityUtils .getUserId()) ? null : SecurityUtils.getTenantId());
+        return prjProOrgDao.query(dto,
+                SecurityUtils.getLoginUserOrNull() == null ?
+                        null :
+                        SecurityUtils.isAdmin(
+                                SecurityUtils.getLoginUserOrNull() == null ? 0L : SecurityUtils .getUserId()
+                        ) ?
+                                null :
+                                SecurityUtils.getTenantId());
     }
 
     @Override

research-system/src/main/java/com/research/system/service/impl/KtsGroupServiceImpl.java

@@ -71,7 +71,9 @@ public class KtsGroupServiceImpl implements KtsGroupService {
                 List<KtResearchContent> ktResearchContents = ktResearchContentMapper.selectByExample(ktResearchContentExample);
                 if (CollUtil.isNotEmpty(ktResearchContents)) {
                     result.setPlanTotal(ktResearchContents.size());
-                    result.setPlanIng(ktResearchContents.stream().filter(ktResearchContent -> ktResearchContent.getStatus() == 1).count());
+//                    if(CollUtil.isNotEmpty(result.getChildrenList())){
+                        result.setPlanIng(ktResearchContents.stream().filter(ktResearchContent -> ktResearchContent.getStatus() == 1).count());
+//                    }
                 }
                 //查询成果
                 KtExpectedOutcomesExample ktExpectedOutcomesExample = new KtExpectedOutcomesExample();
@@ -486,8 +488,11 @@ public class KtsGroupServiceImpl implements KtsGroupService {
             LoginUser loginUser = SecurityUtils.getLoginUser();
             for (Long l : dto.getIdList()) {
                 KtsKtGroupMember ktsKtGroupMember = ktsKtGroupMemberMapper.selectByPrimaryKey(l);
-                if(ObjectUtil.isNotNull(ktsKtGroupMember) && !ktsKtGroupMember.getProjOrgId().equals(loginUser.getUser().getOrgId())){
-                    throw new BaseException("您无法删除其他合作单位的课题组");
+                if(ObjectUtil.isNotNull(ktsKtGroupMember)){
+                    KtsKtGroupWithBLOBs ktsKtGroup = ktsKtGroupMapper.selectByPrimaryKey(ktsKtGroupMember.getKtGroupId());
+                    if(ObjectUtil.isNotNull(ktsKtGroup) && !ktsKtGroup.getProjOrgId().equals(loginUser.getUser().getOrgId())){
+                        throw new BaseException("您无法删除其他合作单位下的成员");
+                    }
                 }
             }
         }

research-system/src/main/java/com/research/system/service/impl/MemberAduitServiceImpl.java

@@ -192,24 +192,32 @@ public class MemberAduitServiceImpl implements MemberAduitService {
             }else {
                 //如果是参与人，需要合作单位负责人审核，审核后进入下一环节（项目负责人）
                 if(status == 1) {
-                    KtsKtGroupMemberAduit newAduit = new KtsKtGroupMemberAduit();
-                    BeanUtil.copyProperties(ktsKtGroupMemberAduit, newAduit);
-                    newAduit.setId(IdUtil.getSnowflakeNextId());
-                    newAduit.setStep((byte) 1);
                     List<Long> reviewerList = memberAduitDao.queryReviewerUserIdList(null, 0);
                     if (CollUtil.isEmpty(reviewerList)) {
                         throw new BaseException("未找到项目的负责人信息");
                     }
-                    newAduit.setReviewer(reviewerList.stream().map(String::valueOf).collect(Collectors.joining(",")));
-                    ktsKtGroupMemberAduitMapper.insertSelective(newAduit);
-                    //添加消息
-                    SrvMessage srvMessage = new SrvMessage();
-                    srvMessage.setId(IdUtil.getSnowflakeNextId());
-                    srvMessage.setContent("成员申请审核");
-                    srvMessage.setBusinessId(newAduit.getId());
-                    srvMessage.setStatus((byte) 0);
-                    srvMessage.setReceiver(reviewerList.stream().map(String::valueOf).collect(Collectors.joining(",")));
-                    srvMessageMapper.insertSelective(srvMessage);
+                    //如果当前用户和二次审核人一样，则直接审核通过
+                    for (Long l : reviewerList) {
+                        if(SecurityUtils.getUserId().equals(l)){
+                            isAudit = true;
+                        }
+                    }
+                    if(!isAudit){
+                        KtsKtGroupMemberAduit newAduit = new KtsKtGroupMemberAduit();
+                        BeanUtil.copyProperties(ktsKtGroupMemberAduit, newAduit);
+                        newAduit.setId(IdUtil.getSnowflakeNextId());
+                        newAduit.setStep((byte) 1);
+                        newAduit.setReviewer(reviewerList.stream().map(String::valueOf).collect(Collectors.joining(",")));
+                        ktsKtGroupMemberAduitMapper.insertSelective(newAduit);
+                        //添加消息
+                        SrvMessage srvMessage = new SrvMessage();
+                        srvMessage.setId(IdUtil.getSnowflakeNextId());
+                        srvMessage.setContent("成员申请审核");
+                        srvMessage.setBusinessId(newAduit.getId());
+                        srvMessage.setStatus((byte) 0);
+                        srvMessage.setReceiver(reviewerList.stream().map(String::valueOf).collect(Collectors.joining(",")));
+                        srvMessageMapper.insertSelective(srvMessage);
+                    }
                 }
             }
         }else{