问题处理

hx-oa/src/main/java/com/fjhx/oa/entity/user/po/UserSalaryManage.java

@@ -1,6 +1,7 @@
 package com.fjhx.oa.entity.user.po;
 
 import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import lombok.Getter;
 import lombok.Setter;
@@ -13,6 +14,7 @@ import java.util.Date;
  */
 @Getter
 @Setter
+@TableName("sys_user")
 public class UserSalaryManage {
 
     @TableId

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

@@ -1,15 +1,17 @@
 package com.fjhx.oa.service.user;
 
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.IService;
 import com.fjhx.oa.entity.user.dto.UserSalaryManageDto;
 import com.fjhx.oa.entity.user.dto.UserSalaryManageSelectDto;
+import com.fjhx.oa.entity.user.po.UserSalaryManage;
 import com.fjhx.oa.entity.user.vo.UserSalaryManageVo;
 
 
 /**
  * 员工薪资管理 服务类
  */
-public interface UserSalaryManageService {
+public interface UserSalaryManageService extends IService<UserSalaryManage> {
 
     /**
      * 员工薪资管理分页

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

@@ -3,6 +3,7 @@ package com.fjhx.oa.service.user.impl;
 import cn.hutool.core.util.ObjectUtil;
 import com.baomidou.dynamic.datasource.annotation.DSTransactional;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.fjhx.common.utils.Assert;
 import com.fjhx.file.entity.FileInfoVo;
 import com.fjhx.file.utils.ObsFileUtil;
@@ -36,11 +37,9 @@ import java.util.stream.Collectors;
  * @since 2024-06-11
  */
 @Service
-public class UserSalaryManageServiceImpl implements UserSalaryManageService {
+public class UserSalaryManageServiceImpl extends ServiceImpl<UserSalaryManageMapper, UserSalaryManage> implements UserSalaryManageService {
 
     @Resource
-    private UserSalaryManageMapper baseMapper;
-    @Resource
     private UserSalaryDetailService userSalaryDetailService;
 
     @Override
@@ -82,7 +81,8 @@ public class UserSalaryManageServiceImpl implements UserSalaryManageService {
         }
 
         //再处理新数据
-        baseMapper.updateDataById(dto);
+//        baseMapper.updateDataById(dto);
+        this.updateById(dto);
         ObsFileUtil.editFile(dto.getFileList(), dto.getUserId(), 10);
         List<UserSalaryDetail> userSalaryDetailList = dto.getUserSalaryDetailList();
         for (UserSalaryDetail userSalaryDetail : userSalaryDetailList) {