Browse Source

问题处理

yzc 10 months ago
parent
commit
d520efddcb

+ 2 - 2
hx-oa/src/main/java/com/fjhx/oa/service/user/impl/UserSalaryManageServiceImpl.java

@@ -81,14 +81,14 @@ public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMap
         }
         }
 
 
         //再处理新数据
         //再处理新数据
-//        baseMapper.updateDataById(dto);
+        dataVer++;//版本号+1
         this.updateById(dto);
         this.updateById(dto);
         ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);
         ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);
         List<UserSalaryDetail> userSalaryDetailList = dto.getUserSalaryDetailList();
         List<UserSalaryDetail> userSalaryDetailList = dto.getUserSalaryDetailList();
         for (UserSalaryDetail userSalaryDetail : userSalaryDetailList) {
         for (UserSalaryDetail userSalaryDetail : userSalaryDetailList) {
             userSalaryDetail.setId(null);
             userSalaryDetail.setId(null);
             userSalaryDetail.setUserId(dto.getUserId());
             userSalaryDetail.setUserId(dto.getUserId());
-            userSalaryDetail.setDataVer(++dataVer);
+            userSalaryDetail.setDataVer(dataVer);
             userSalaryDetail.setIsCurrentVer(1);
             userSalaryDetail.setIsCurrentVer(1);
         }
         }
         userSalaryDetailService.saveBatch(userSalaryDetailList);
         userSalaryDetailService.saveBatch(userSalaryDetailList);