Browse Source

公出时间段判定修改

anderx 8 months ago
parent
commit
3bc1a8021a

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

@@ -2438,20 +2438,18 @@ public class PublicReleaseServiceImpl extends BaseMybatisDao<PublicReleaseMapper
 			throw new BusinessException("转换异常");
 		}
 		//如果主协单且一起公出
-		if(in.getAssist()==1&&in.getAlone()==1){
-			//判定当前发起人能发起不
-			if(checkPublicTime(TokenManager.getAdminId(), in)){
-				//第一种,发起人时间重复
-				return 1;
+		if(in.getAssist()==1){
+			//如果一起公出先判定发起人,再判定协单人,如果只是协单公出则只需要判定协单
+			if (in.getAlone()==1){
+				if(checkPublicTime(TokenManager.getAdminId(), in)){
+					//第一种,发起人时间重复
+					return 1;
 //				return true;
+				}
 			}
 			//判定协单时间重复
 			Integer x = checkTech(in);
 			if (x != null) return x;
-		}else if(in.getAssist()==1&&in.getAlone()==2){
-			//判定协单时间重复
-			Integer x = checkTech(in);
-			if (x != null) return x;
 		}else {
 			//判定当前发起人能发起不
 			if(checkPublicTime(TokenManager.getAdminId(), in)){