anderx лет назад: 2
Родитель
Сommit
7a8f1ed144

+ 5 - 9
src/main/java/com/goafanti/weChat/service/impl/PublicReleaseServiceImpl.java

@@ -102,7 +102,6 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					prd.setMainStatus(1);
 				}else {
 					prd.setMainStatus(0);
-					if(in.getPublicType()==null||in.getPublicType()==0)in.setPublicType(1);
 				}
 				prd.setPrid(in.getId());
 				prd.setUid(s);
@@ -127,15 +126,9 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			publicReleaseDetailsMapper.insertBatch(prdList);
 		}
 		String userNames=str.substring(0,str.length()-1);
-		PublicRelease upName=new PublicRelease();
-		upName.setId(in.getId());
-		upName.setUserNames(userNames);
-		if (in.getPublicType()==1){
-			upName.setPublicType(1);
-		}
+		in.setUserNames(userNames);
 		addpublicLog(in.getId(), PublicReleaseLog.states.fq.getCode(), "发起外出申请");
 		Map<String, Object> map=addPublicReleaseLog(my, in,userNames,date,users);
-		publicReleaseMapper.updateByPrimaryKeySelective(upName);
 		return map;
 	}
 
@@ -195,9 +188,11 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 					str2=str2.append("[").append(u.getNickname()).append("]!!!。");
 					sendEmailAndNoticeAndSoucket(u.getAid(),3,str2.toString());
 					Admin admin = adminMapper.selectByPrimaryKey(u.getAid());
+					if (in.getType()==0&&in.getPublicType()==1){
 					//不是自己的企业则需要审核并设置非自己客户待审核
 					addPublicExamine(in.getId(), admin);
-					if(in.getPublicType()==null|| in.getPublicType()==0) in.setPublicType(1);
+					if(in.getPublicType()==null|| in.getPublicType()==0)in.setPublicType(1);
+					}
 					pushNoticeAndSoucketAndEmail(my, in, date, admin, str, map);
 					status.set(0);
 				}
@@ -216,6 +211,7 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 		if (status.get()==1){
 			pushNoticeAndSoucketAndEmail(my, in, date, a, str, map);
 		}
+			publicReleaseMapper.updateByPrimaryKeySelective(in);
 			map.put("data", publicReleaseMapper.selectDtails(in.getId()));
 		return map;
 	}