修改审批bug

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

@@ -777,10 +777,7 @@ public class SpmkController {
 			redisUtil.set(asId.toString(),0,500);
 			redisUtil.set(asId.toString(),0,500);
 			return ResultUtil.error("您已审批过!");
 			return ResultUtil.error("您已审批过!");
 		}
 		}
-		Integer integer = spmkExecutorMapper.selectCount(new QueryWrapper<SpmkExecutor>().lambda()
-				.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
-				.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
-				.eq(SpmkExecutor::getSts, ExecutorSts.IN_EXECUTION.ordinal()));
+
 		if ( spmkExecutorMapper.selectCount(new QueryWrapper<SpmkExecutor>().lambda()
 		if ( spmkExecutorMapper.selectCount(new QueryWrapper<SpmkExecutor>().lambda()
 				.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
 				.eq(SpmkExecutor::getId, approvingDto.getExecutorId())
 				.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())
 				.eq(SpmkExecutor::getEmpNum, userBean.getEmpNum())

src/main/java/cn/timer/api/dto/spmk/Relation.java

@@ -49,7 +49,7 @@ public class Relation implements Serializable{
 	private List<User> users;
 	private List<User> users;
 
 
 	/**
 	/**
-	 * 主管是否手签 1是 0否
+	 * 是否手签 1是 0否
 	 */
 	 */
 	private Integer signature;
 	private Integer signature;
 
 

src/main/java/cn/timer/api/dto/spmk/User.java

@@ -26,6 +26,4 @@ public class User implements Serializable{
 	
 	
 	private String headUrl;
 	private String headUrl;
 
 
-	private Integer signature;
-
 }
 }

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

@@ -616,7 +616,6 @@ public class RouterUtils {
 									.build()
 									.build()
 									.updateById();
 									.updateById();
 							listUser.get(i_user).setExecute(EXECUTED);
 							listUser.get(i_user).setExecute(EXECUTED);
-						}
 
 
 
 
 							// 历史审批人
 							// 历史审批人
@@ -625,6 +624,7 @@ public class RouterUtils {
 									.historyApprover(listUser.get(i_user).getName())
 									.historyApprover(listUser.get(i_user).getName())
 									.build()
 									.build()
 									.updateById();
 									.updateById();
+
 							//拒绝处理
 							//拒绝处理
 							// 0未执行 1执行中 2同意 3拒绝 4 转派
 							// 0未执行 1执行中 2同意 3拒绝 4 转派
 							if (sts == ExecutorSts.REFUSE.ordinal()) {
 							if (sts == ExecutorSts.REFUSE.ordinal()) {
@@ -652,6 +652,11 @@ public class RouterUtils {
 								n_user = listUser.size();
 								n_user = listUser.size();
 //							System.out.println(listUser);
 //							System.out.println(listUser);
 							}
 							}
+						}
+
+						
+
+
 					}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
 					}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
 						SpmkExecutor.builder()
 						SpmkExecutor.builder()
 							.approveExecuteRecordId(executeRecordId)
 							.approveExecuteRecordId(executeRecordId)