审批 优化

src/main/java/cn/timer/api/config/exception/Regular.java

@@ -14,7 +14,7 @@ public class Regular {
 	 * 手机号码
 	 * 手机号码
 	 */
 	 */
 //	public static final String PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
 //	public static final String PHONE = "^((13[0-9])|(14[5|7])|(15([0-3]|[5-9]))|(17[013678])|(18[0,5-9]))\\d{8}$";
-	public static final String PHONE = "^[1]{10}$";
+	public static final String PHONE = "^[1][0-9]{10}$";
 	/**
 	/**
 	 * 账号是否合法
 	 * 账号是否合法
 	 */
 	 */

src/main/java/cn/timer/api/controller/jxgl/JxglController.java

@@ -633,7 +633,7 @@ public class JxglController {
 						.eq(JxglPerformanceAppraisal::getId, appraisalUpdateSts.getId())
 						.eq(JxglPerformanceAppraisal::getId, appraisalUpdateSts.getId())
 						.eq(JxglPerformanceAppraisal::getSts, appraisalUpdateSts.getSts()));
 						.eq(JxglPerformanceAppraisal::getSts, appraisalUpdateSts.getSts()));
 
 
-		if (performanceAppraisal == null) {
+		if (performanceAppraisal == null && appraisalUpdateSts.getSts() != PerformanceAppraisalSts.PERFORMANCE_ARCHIVE.getType()) {
 			return ResultUtil.error("绩效考核不存在");
 			return ResultUtil.error("绩效考核不存在");
 		}
 		}
 		
 		

src/main/java/cn/timer/api/controller/spmk/SpmkController.java

@@ -580,7 +580,7 @@ public class SpmkController {
 				throw new CustomException("审批汇总-新增异常");
 				throw new CustomException("审批汇总-新增异常");
 			}
 			}
 			
 			
-			// 插入记录
+			// 插入记录- 审批执行记录 - 执行人记录
 			RouterUtils.insertogExecuteRecord(listFlowChildren, as.getId());
 			RouterUtils.insertogExecuteRecord(listFlowChildren, as.getId());
 			
 			
 			// 封装 审批详情
 			// 封装 审批详情

src/main/java/cn/timer/api/dto/jxgl/AppraisalUpdateSts.java

@@ -20,7 +20,7 @@ public class AppraisalUpdateSts {
 	private Integer id;
 	private Integer id;
 	
 	
 	@NotNull(message = ValidationMsg.NOTNULL)
 	@NotNull(message = ValidationMsg.NOTNULL)
-	@ApiModelProperty(value = "状态", example = "")
+	@ApiModelProperty(value = "状态 0目标制定 1绩效评分 2结果确认 3绩效归档 4终止考核", example = "0")
 	private Integer sts;
 	private Integer sts;
 	
 	
 }
 }

src/main/java/cn/timer/api/utils/router/RouterUtils.java

@@ -363,11 +363,15 @@ public class RouterUtils {
 		Router router;
 		Router router;
 		if (listRouter != null && listRouter.size() == 1) {
 		if (listRouter != null && listRouter.size() == 1) {
 			router = listRouter.get(0);
 			router = listRouter.get(0);
-			if (router.getFlow()) {
-				FlowChildren fc = FlowChildren.builder().build();
-				BeanUtil.copyProperties(router, fc, "condition","children");
-				listFlowChildren.add(fc);
-				getIsFlowChildren(router.getChildren(), listFlowChildren);
+			
+			Relation relation = CollectionUtil.getFirst(router.getRelation());
+			if (relation != null && CollectionUtil.isNotEmpty(relation.getUsers())) {
+				if (router.getFlow()) {
+					FlowChildren fc = FlowChildren.builder().build();
+					BeanUtil.copyProperties(router, fc, "condition","children");
+					listFlowChildren.add(fc);
+					getIsFlowChildren(router.getChildren(), listFlowChildren);
+				}
 			}
 			}
 			
 			
 		}else if (listRouter != null && listRouter.size() > 1) {
 		}else if (listRouter != null && listRouter.size() > 1) {