繁体字

src/main/java/org/springblade/bank/checklist/controller/ChecklistController.java

@@ -317,9 +317,9 @@ public class ChecklistController extends BladeController {
 			for (int i = 0; i <= days; i++) {
 				String theDay = getDay(dateBegin, i);
 				// 延长一天，是为了sql可以查询出最后一天的记录
-				String nextDay = getDay(dateBegin, i + 1);
+//				String nextDay = getDay(dateBegin, i + 1);
 				checklist.setDate_begin(theDay);
-				checklist.setDate_end(nextDay);
+				checklist.setDate_end(theDay);
 
 				deptChildIds.forEach(deptId -> {
 					List<Map> reportData = getReportData(checklist, dataType, theDay, deptService.getById(deptId), check_category, check_item);

src/main/java/org/springblade/bank/goodsuse/controller/GoodsUseController.java

@@ -171,10 +171,14 @@ public class GoodsUseController extends BladeController {
 			goodsUse.setPersonName(setting.getPersonName());
 		}
 
-		if (StringUtils.isNotBlank(goodsUse.getFillingNo())){
-			User user = userService.getById(AuthUtil.getUser().getUserId());
-			Assert.isTrue(!user.getEhr().equals(goodsUse.getFillingNo()), "確認人和發起人不能為同一人！");
+		User createUser = null;
+		if (goodsUse.getCreateUser() == null){
+			// 新增
+			createUser = userService.getById(AuthUtil.getUserId());
+		}else{
+			createUser = userService.getById(goodsUse.getCreateUser());
 		}
+		Assert.isTrue(!createUser.getEhr().equals(goodsUse.getPersonNo()), "確認人和發起人不能為同一人！");
 		goodsUse.setProcess(2);
 
 

src/main/java/org/springblade/bank/postchange/controller/PostChangeController.java

@@ -152,7 +152,7 @@ public class PostChangeController extends BladeController {
 
 		postChange.setProcess(2);
 		PostChange last = postChangeService.getLastRecord(dept);
-		if (last != null){
+		if (isAdd && last != null){
 			//上一条记录
 			postChange.setPreviousId(last.getId());
 		}