yzc hace 10 meses
padre
commit
5da5f7f338

+ 2 - 1
hx-oa/src/main/java/com/fjhx/oa/mapper/user/UserSalaryDetailMapper.java

@@ -4,6 +4,7 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.fjhx.oa.entity.user.po.UserSalaryDetail;
 import com.fjhx.oa.entity.user.vo.UserSalaryDetailVo;
 import com.ruoyi.common.utils.wrapper.IWrapper;
+import org.apache.ibatis.annotations.Param;
 
 import java.util.List;
 
@@ -18,5 +19,5 @@ import java.util.List;
  */
 public interface UserSalaryDetailMapper extends BaseMapper<UserSalaryDetail> {
 
-    List<UserSalaryDetailVo> getList(IWrapper<UserSalaryDetail> wrapper);
+    List<UserSalaryDetailVo> getList(@Param("ew") IWrapper<UserSalaryDetail> wrapper);
 }

+ 1 - 1
hx-oa/src/main/java/com/fjhx/oa/service/salary/impl/SalaryStructureServiceImpl.java

@@ -61,7 +61,7 @@ public class SalaryStructureServiceImpl extends ServiceImpl<SalaryStructureMappe
 
     @Override
     public void delete(Long id) {
-        List<UserSalaryDetailVo> list = userSalaryDetailService.getList(IWrapper.getWrapper());
+        List<UserSalaryDetailVo> list = userSalaryDetailService.getList(IWrapper.getWrapper().eq("usd.salary_structure_id", id));
         if (ObjectUtil.isNotEmpty(list)) {
             throw new ServiceException("该薪资结构已被使用,禁止删除");
         }

+ 1 - 1
hx-oa/src/main/java/com/fjhx/oa/service/user/impl/UserSalaryDetailServiceImpl.java

@@ -24,6 +24,6 @@ public class UserSalaryDetailServiceImpl extends ServiceImpl<UserSalaryDetailMap
 
     @Override
     public List<UserSalaryDetailVo> getList(IWrapper wrapper) {
-        return baseMapper.getList(getWrapper());
+        return baseMapper.getList(wrapper);
     }
 }