员工补贴bug修改

ruoyi-common/src/main/java/com/ruoyi/common/core/mapper/BaseMapperPlus.java

@@ -195,7 +195,7 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
      *
      * @return 成功标志
      */
-    @Select("DELETE FROM pay_butie_emplyee WHERE date = #{thisMonth} and tenant_id=#{tenantId}")
+    @Select("DELETE FROM pay_butie_emplyee WHERE date = #{month} and tenant_id=#{tenantId}")
     void deleteSgrButieEmplyeeByDate(@Param("month") String month,@Param("tenantId") Long tenantId);
 
     @Select("SELECT COUNT(*) FROM pay_butie_emplyee WHERE date = #{month}")

ruoyi-framework/src/main/java/com/ruoyi/framework/config/MybatisPlusConfig.java

@@ -55,7 +55,7 @@ public class MybatisPlusConfig {
             @Override
             public boolean ignoreTable(String tableName) {
                 // 判断是否登录，如果登录则过滤
-                if (StpUtil.getLoginIdDefaultNull() != null) {
+              /*  if (StpUtil.getLoginIdDefaultNull() != null) {
                     // 判断是否平台超级管理员，如果是平台超级管理员则拥有所有数据权限
                     if (!LoginHelper.isAdmin(LoginHelper.getLoginUser().getUserId())) {
                         // 需要拼接租户条件的表
@@ -88,7 +88,7 @@ public class MybatisPlusConfig {
                         // 判断tableName是否在tenantTables中, 在的话返回false, 不在的话返回true
                         return !list.contains(tableName.toLowerCase(Locale.ROOT));
                     }
-                }
+                }*/
                 return true;
             }
 

ruoyi-pay/src/main/java/com/ruoyi/pay/controller/PayButieEmplyeeController.java

@@ -159,6 +159,7 @@ public class PayButieEmplyeeController extends BaseController {
         }
         PayEmployeeInfoBo employeeInfo = new PayEmployeeInfoBo();
         employeeInfo.setId(bo.getEmployeeId());
+        employeeInfo.setTenantId(bo.getTenantId());
         TableDataInfo<PayEmployeeInfoVo> payEmployeeTableDataInfo = employeeInfoService.queryPageList(employeeInfo, pageQuery);
         List<ButieSummaryVo> butieSummaryVos = this.buildEmployeeInfo(payEmployeeTableDataInfo.getRows(), date);
         return TableDataInfo.build(butieSummaryVos);

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayButieEmplyeeServiceImpl.java

@@ -151,7 +151,9 @@ public class PayButieEmplyeeServiceImpl implements IPayButieEmplyeeService {
         baseMapper.deleteSgrButieEmplyeeByDate(month,tenantId);
         PayButieBo bo = new PayButieBo();
         bo.setTenantId(tenantId);
-        List<PayButieVo> butieList = butieService.queryList(null); // 获取补贴列表
+        PayButieBo pbt = new PayButieBo();
+        pbt.setTenantId(tenantId);
+        List<PayButieVo> butieList = butieService.queryList(pbt); // 获取补贴列表
         PayEmployeeInfoBo yg = new PayEmployeeInfoBo();
         yg.setTenantId(tenantId);
         List<PayEmployeeInfoVo> employeeInfoList = employeeInfoService.queryList(yg);// 获取员工列表

ruoyi-pay/src/main/java/com/ruoyi/pay/service/impl/PayButieServiceImpl.java

@@ -59,7 +59,7 @@ public class PayButieServiceImpl implements IPayButieService {
     }
 
     private LambdaQueryWrapper<PayButie> buildQueryWrapper(PayButieBo bo) {
-        Map<String, Object> params = bo.getParams();
+       // Map<String, Object> params = bo.getParams();
         LambdaQueryWrapper<PayButie> lqw = Wrappers.lambdaQuery();
         lqw.eq(bo.getTenantId() != null, PayButie::getTenantId, bo.getTenantId());
         lqw.like(StringUtils.isNotBlank(bo.getName()), PayButie::getName, bo.getName());