bug修改

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

@@ -198,6 +198,6 @@ public interface BaseMapperPlus<M, T, V> extends BaseMapper<T> {
     @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}")
+    @Select("SELECT COUNT(*) FROM pay_butie_emplyee WHERE date = #{month} and tenant_id=#{tenantId}")
     Integer getLatestDate(@Param("month") String month,@Param("tenantId") Long tenantId);
 }

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

@@ -181,6 +181,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
                 PayAttendanceBo sgrAttendance = new PayAttendanceBo();
                 sgrAttendance.setEmpName(employee.getEmpName());
                 sgrAttendance.setKaoqinDate(bhworkTime.getDate());
+                sgrAttendance.setTenantId(bo.getTenantId());
                 List<PayAttendanceVo> ats = attendanceService.queryList(sgrAttendance);
                 // 判断考勤是否存在-务必存在考勤，没有需要补考勤
                 if (ObjectUtil.isNull(ats) || ats.size() == 0) {
@@ -274,6 +275,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
         // 增加对应的产品列表
         for (PayBaohuoProduct product : prodList) {
             product.setWoId(bo.getId());
+            product.setTenantId(bo.getTenantId());
             PayBaohuoProductBo productBo= BeanUtil.toBean(product,PayBaohuoProductBo.class);
             bhproductService.insertByBo(productBo);
         }
@@ -285,6 +287,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
             employee.setIntime(bo.getInstorageTime());
             employee.setHelper(employee.getHelper());
             employee.setAmount(average);
+            employee.setTenantId(bo.getTenantId());
             PayBaohuoEmployeeBo payBaohuoEmployeeBo = BeanUtil.toBean(employee, PayBaohuoEmployeeBo.class);
             boolean a = bhemployeeService.insertByBo(payBaohuoEmployeeBo);
 
@@ -294,6 +297,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
                 sgrWorkTime.setWoId(bo.getId());
                 sgrWorkTime.setEmpId(employee.getEmpId());
                 sgrWorkTime.setBheId(employee.getId());
+                sgrWorkTime.setTenantId(bo.getTenantId());
                 //sgrWorkTime.setIntime(sgrWorkOrderBaohuo.getInstorageTime());
                 PayBaohuoWorktimeBo payBaohuoWorktimeBo = BeanUtil.toBean(sgrWorkTime, PayBaohuoWorktimeBo.class);
                 bhworktimeService.insertByBo(payBaohuoWorktimeBo);
@@ -383,6 +387,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
                 PayAttendanceBo sgrAttendance = new PayAttendanceBo();
                 sgrAttendance.setEmpName(employee.getEmpName());
                 sgrAttendance.setKaoqinDate(bhworkTime.getDate());
+                sgrAttendance.setTenantId(bo.getTenantId());
                 List<PayAttendanceVo> ats = attendanceService.queryList(sgrAttendance);
                 // 判断考勤是否存在-务必存在考勤，没有需要补考勤
                 if (ObjectUtil.isNull(ats) || ats.size() == 0) {
@@ -459,6 +464,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
         // 增加对应的产品列表
         for (PayBaohuoProduct product : prodList) {
             product.setWoId(bo.getId());
+            product.setTenantId(bo.getTenantId());
             PayBaohuoProductBo productBo= BeanUtil.toBean(product,PayBaohuoProductBo.class);
             bhproductService.insertByBo(productBo);
         }
@@ -470,6 +476,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
             employee.setIntime(bo.getInstorageTime());
             employee.setHelper(employee.getHelper());
             employee.setAmount(average);
+            employee.setTenantId(bo.getTenantId());
             PayBaohuoEmployeeBo payBaohuoEmployeeBo = BeanUtil.toBean(employee, PayBaohuoEmployeeBo.class);
             boolean a = bhemployeeService.insertByBo(payBaohuoEmployeeBo);
 
@@ -479,6 +486,7 @@ public class PayWorkOrderBaohuoServiceImpl implements IPayWorkOrderBaohuoService
                 sgrWorkTime.setWoId(bo.getId());
                 sgrWorkTime.setEmpId(employee.getEmpId());
                 sgrWorkTime.setBheId(employee.getId());
+                sgrWorkTime.setTenantId(bo.getTenantId());
                 //sgrWorkTime.setIntime(sgrWorkOrderBaohuo.getInstorageTime());
                 PayBaohuoWorktimeBo payBaohuoWorktimeBo = BeanUtil.toBean(sgrWorkTime, PayBaohuoWorktimeBo.class);
                 bhworktimeService.insertByBo(payBaohuoWorktimeBo);