|
|
@@ -1670,6 +1670,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (aid.equals(out.getAid())){
|
|
|
flag2=true;
|
|
|
}
|
|
|
+ out.setMyExamine(0);
|
|
|
if (out.getType()==0||out.getType()==1||out.getType()==2){
|
|
|
if (adminPublicReviewerBos==null)adminPublicReviewerBos = adminPublicReviewerMapper.selectByAid(out.getAid());
|
|
|
//判定是否是上级审核人
|
|
|
@@ -1692,8 +1693,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
){
|
|
|
if (myFlag){
|
|
|
out.setMyExamine(1);
|
|
|
- }else {
|
|
|
- out.setMyExamine(0);
|
|
|
}
|
|
|
}else if(out.getPublicType()==1&&out.getStatus()==1){
|
|
|
//他人公出审核
|
|
|
@@ -1719,7 +1718,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
}
|
|
|
}
|
|
|
if (myExamine)out.setMyExamine(1);
|
|
|
- else out.setMyExamine(0);
|
|
|
} else if ((out.getAssistProcess()==2||out.getAssistProcess()==3)&&out.getStatus()==1) {
|
|
|
//添加协单审核人可以查看
|
|
|
List<PublicRelease> publicReleases = publicReleaseMapper.selectByMainId(out.getId(), null, null);
|
|
|
@@ -1731,8 +1729,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
flag=false;
|
|
|
if (myFlag){
|
|
|
out.setMyExamine(1);
|
|
|
- }else {
|
|
|
- out.setMyExamine(0);
|
|
|
}
|
|
|
break;
|
|
|
}
|
|
|
@@ -1828,12 +1824,12 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
for (String name : names) {
|
|
|
str.append(name+",");
|
|
|
}
|
|
|
- out.setMyExamine(1);
|
|
|
- for (String s : ids) {
|
|
|
- if (s.equals(TokenManager.getAdminId())){
|
|
|
- out.setMyExamine(0);
|
|
|
- }
|
|
|
- }
|
|
|
+// out.setMyExamine(1);
|
|
|
+// for (String s : ids) {
|
|
|
+// if (s.equals(TokenManager.getAdminId())){
|
|
|
+// out.setMyExamine(0);
|
|
|
+// }
|
|
|
+// }
|
|
|
} else {
|
|
|
List<AdminPublicReviewerBo> collect = adminPublicReviewerBos.stream().filter(e -> e.getType() == 0).collect(Collectors.toList());
|
|
|
for (AdminPublicReviewerBo e : collect) {
|