|
|
@@ -1685,7 +1685,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
if (e.getReviewerId().equals(aid)){
|
|
|
- flag=false;
|
|
|
+ flag=true;
|
|
|
if (out.getType()==0){
|
|
|
flag2=true;
|
|
|
}
|
|
|
@@ -1705,7 +1705,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if(out.getPublicType()==2){
|
|
|
for (PublicExamine p : ps) {
|
|
|
if (p.getAid().equals(aid)){{
|
|
|
- flag = false;
|
|
|
+ flag = true;
|
|
|
break;
|
|
|
}
|
|
|
|
|
|
@@ -1717,7 +1717,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (!ps.isEmpty()){
|
|
|
for (PublicExamine p : ps) {
|
|
|
if (p.getAid().equals(aid)){
|
|
|
- flag=false;
|
|
|
+ flag=true;
|
|
|
if (out.getPublicType()==1&&out.getStatus()==1){
|
|
|
if (p.getStatus()==0)out.setMyExamine(1);
|
|
|
else out.setMyExamine(0);
|
|
|
@@ -1733,7 +1733,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (OutPublicReleaseDetails ord : outPublicReleaseDetails) {
|
|
|
User user = userMapper.selectByPrimaryKey(ord.getUid());
|
|
|
if (user.getAid().equals(aid)){
|
|
|
- flag=false;
|
|
|
+ flag=true;
|
|
|
if (out.getTechStartProcess()==1)myExamine=true;
|
|
|
|
|
|
}
|
|
|
@@ -1747,7 +1747,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<AdminPublicReviewerBo> collect2 = sonAPRList.stream().filter(e2 -> e2.getType() == 1).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e2 : collect2) {
|
|
|
if (e2.getReviewerId().equals(aid)){
|
|
|
- flag=false;
|
|
|
+ flag=true;
|
|
|
if((out.getAssistProcess()==2||out.getAssistProcess()==3)&&
|
|
|
out.getStatus()==1
|
|
|
){
|
|
|
@@ -1764,7 +1764,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 1).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|
|
|
if (e.getReviewerId().equals(aid)){
|
|
|
- flag=false;
|
|
|
+ flag=true;
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
@@ -1786,14 +1786,14 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
|
|
|
//处理返回
|
|
|
if(flag){
|
|
|
- out=null;
|
|
|
- return out;
|
|
|
- }else {
|
|
|
if(aid.equals(out.getAid())) {
|
|
|
out.setPermission(0);
|
|
|
}else {
|
|
|
out.setPermission(1);
|
|
|
}
|
|
|
+ }else {
|
|
|
+ out=null;
|
|
|
+ return out;
|
|
|
}
|
|
|
}
|
|
|
//设置审核人
|