Browse Source

Merge branch 'test' into test2

# Conflicts:
#	src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java
anderx 1 year ago
parent
commit
28a75b247d

+ 16 - 1
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -1712,7 +1712,22 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 						}
 					}
 				}
-				} else if ((out.getTechStartProcess()==1&&out.getTechStartProcess()==2)&&out.getStatus()==1) {
+				} 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());
 					boolean myExamine = false;
 					for (OutPublicReleaseDetails ord : outPublicReleaseDetails) {