|
|
@@ -1698,21 +1698,30 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
|
|
|
if (myFlag){
|
|
|
out.setMyExamine(1);
|
|
|
}
|
|
|
- if((out.getPublicType()==1||out.getPublicType()==2)){
|
|
|
- //他人公出审核
|
|
|
- if (!ps.isEmpty()){
|
|
|
- for (PublicExamine p : ps) {
|
|
|
- flag=false;
|
|
|
- if (out.getPublicType()==1&&out.getStatus()==1){
|
|
|
- if (p.getAid().equals(aid)){
|
|
|
+ if(out.getPublicType()==2){
|
|
|
+ for (PublicExamine p : ps) {
|
|
|
+ if (p.getAid().equals(aid)){{
|
|
|
+ flag = false;
|
|
|
+ break;
|
|
|
+ }
|
|
|
+
|
|
|
+ }
|
|
|
+ }
|
|
|
+ } else if (out.getPublicType()==1) {
|
|
|
+ //他人公出审核
|
|
|
+ if (!ps.isEmpty()){
|
|
|
+ for (PublicExamine p : ps) {
|
|
|
+ if (p.getAid().equals(aid)){
|
|
|
+ flag=false;
|
|
|
+ if (out.getPublicType()==1&&out.getStatus()==1){
|
|
|
if (p.getStatus()==0)out.setMyExamine(1);
|
|
|
else out.setMyExamine(0);
|
|
|
break;
|
|
|
}
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
}
|
|
|
- //技术公出营销审核
|
|
|
}
|
|
|
} else if ((out.getTechStartProcess()==1&&out.getTechStartProcess()==2)&&out.getStatus()==1) {
|
|
|
List<OutPublicReleaseDetails> outPublicReleaseDetails = publicReleaseDetailsMapper.selectByPrid(out.getId());
|