Browse Source

Merge branch 'test' of jishutao/kede-server into prod

anderx 8 months ago
parent
commit
c1f528c5dc

+ 1 - 0
src/main/java/com/goafanti/Interview/service/impl/UserArchivesInterviewServiceImpl.java

@@ -121,6 +121,7 @@ public class UserArchivesInterviewServiceImpl extends BaseMybatisDao<UserArchive
                 in.setEarlyCommunication(null);
                 in.setInterviewIdeas(null);
                 in.setCreateTime(new Date());
+                in.setUpdateTime(new Date());
                 userArchivesMapper.insert(in);
             }
         }

+ 11 - 9
src/main/java/com/goafanti/order/service/impl/OrderProjectServiceImpl.java

@@ -1066,15 +1066,17 @@ public class OrderProjectServiceImpl extends BaseMybatisDao<TOrderTaskMapper> im
 		Map<String, Object> params = new HashMap<String, Object>();
 		if(pageSize==null||pageSize<0)pageSize=10;
 		if(pageNo==null||pageNo<0)pageNo=1;
-		pushParams(params,"aid",TokenManager.getAdminId());
-		pushParams(params,"name",name);
-		pushParams(params,"orderNo",orderNo);
-		pushParams(params,"taskId",taskId);
-		pushParams(params,"taskStatus",taskStatus);
-		pushParams(params,"depId",depId);
-		pushParams(params,"thchId",thchId);
-		pushParams(params,"adminName", adminName);
-		pushParams(params,"type", type.split(","));
+		params.put("aid", TokenManager.getAdminId()==null?"":TokenManager.getAdminId());
+		if (StringUtils.isNotBlank(name)) params.put("name", name);
+		if (StringUtils.isNotBlank(depId)) params.put("depId", depId);
+		if (StringUtils.isNotBlank(orderNo)) params.put("orderNo", orderNo);
+		if (StringUtils.isNotBlank(taskId)) params.put("taskId", taskId);
+		if (StringUtils.isNotBlank(thchId)) params.put("thchId", thchId);
+		if (StringUtils.isNotBlank(adminName)) params.put("adminName", adminName);
+		if (null != taskStatus) params.put("taskStatus", taskStatus);
+		if (StringUtils.isNotBlank(type)){
+			params.put("type", type.split(","));
+		}
 		Pagination<TOrderTaskListBo> p = (Pagination<TOrderTaskListBo>)findPage("selectTaskListByPage", "selectTaskListCount", params, pageNo, pageSize);
 		return p;
 	}

+ 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)){