Merge branch 'tzq' into 'develop'

审批转派

See merge request 8timerv2/8timerapiv200!256

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

@@ -550,10 +550,14 @@ public class RouterUtils {
 						//在 原审批人 列表中 插入 一个被转派人(审批人)
 						}else if (sts == ExecutorSts.REDEPLOY.ordinal()) {
 							List<User> users1 = CollectionUtil.sub(listUser, 0, i_user+1);
+							redeployUser.setExecute(UNEXECUTED);
 							users1.add(redeployUser);
 							List<User> users2 = CollectionUtil.sub(listUser, i_user+1, listUser.size());
+							System.out.println(users1);
+							System.out.println(users2);
 							listUser = ListUtils.union(users1, users2);
 							n_user = listUser.size();
+							System.out.println(listUser);
 						}
 					}else if (UNEXECUTED.equals(listUser.get(i_user).getExecute())) {
 						SpmkExecutor.builder()

src/main/java/cn/timer/api/utils/router/business/ReissueACardBusiness.java

@@ -39,7 +39,7 @@ public class ReissueACardBusiness extends SpmkAssoBusiness {
 		String PatchCardTime = ObjectUtil.isNull(jsonObj.get("__PatchCardTime",FromData.class)) ? null : jsonObj.get("__PatchCardTime",FromData.class).getValue();
 		// 缺卡原因
 		String cardShortage = ObjectUtil.isNull(jsonObj.get("cardShortage",FromData.class)) ? null : jsonObj.get("cardShortage",FromData.class).getValue();
-		
+
 		// 缺卡时段-上班、下班-前端未改
 		String cardSupplementType = ObjectUtil.isNull(jsonObj.get("__CardSupplementType",FromData.class)) ? null : jsonObj.get("__CardSupplementType",FromData.class).getValue();