问题处理

hx-oa/src/main/java/com/fjhx/oa/mapper/user/UserSalaryManageMapper.java

@@ -32,6 +32,6 @@ public interface UserSalaryManageMapper extends BaseMapper<UserSalaryManage> {
 
     UserSalaryManageVo getDetail(@Param("userId") Long userId);
 
-    Integer updateById(UserSalaryManageDto dto);
+    Integer updateDataById(UserSalaryManageDto dto);
 
 }

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

@@ -85,7 +85,7 @@ public class UserSalaryManageServiceImpl implements UserSalaryManageService {
         }
 
         //再处理新数据
-        baseMapper.updateById(dto);
+        baseMapper.updateDataById(dto);
         ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);
         List<UserSalaryDetail> userSalaryDetailList = dto.getUserSalaryDetailList();
         for (UserSalaryDetail userSalaryDetail : userSalaryDetailList) {

hx-oa/src/main/resources/mapper/user/UserSalaryManageMapper.xml

@@ -33,7 +33,7 @@
         <include refid="list"/>
         where su.user_id = #{userId}
     </select>
-    <update id="updateById">
+    <update id="updateDataById">
         update sys_user
         <set>
             <if test="employeeType != null and employeeType != ''">employee_type = #{employeeType},</if>