no message

mall-server-api/src/main/java/com/gree/mall/manager/logic/settle/repair/DailyImportSummaryLogic.java

@@ -1270,8 +1270,8 @@ public class DailyImportSummaryLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         return settleDailyIssueSummaryRecordService.lambdaQuery()
-                .eq(CollectionUtil.isNotEmpty(adminUser.getCompanyWechatIds()), SettleDailyIssueSummaryRecord::getCompanyWechatId, adminUser.getCompanyWechatIds())
-                .eq(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), SettleDailyIssueSummaryRecord::getWebsitNumber, adminUser.getAdminWebsitIds())
+                .in(CollectionUtil.isNotEmpty(adminUser.getCompanyWechatIds()), SettleDailyIssueSummaryRecord::getCompanyWechatId, adminUser.getCompanyWechatIds())
+                .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), SettleDailyIssueSummaryRecord::getWebsitNumber, adminUser.getAdminWebsitIds())
                 .eq(StringUtils.isNotEmpty(summaryBatchNo), SettleDailyIssueSummaryRecord::getSummaryBatchNo, summaryBatchNo)
                 .eq(StringUtils.isNotEmpty(summaryCommpany), SettleDailyIssueSummaryRecord::getSummaryNumber, summaryCommpany)
                 .eq(StringUtils.isNotEmpty(month), SettleDailyIssueSummaryRecord::getMonth, month)
@@ -1331,8 +1331,8 @@ public class DailyImportSummaryLogic {
         AdminUserCom adminUser = commonLogic.getAdminUser();
 
         IPage<SettleDailyIssueSummaryMonthRecord> page = settleDailyIssueSummaryMonthRecordService.lambdaQuery()
-                .eq(CollectionUtil.isNotEmpty(adminUser.getCompanyWechatIds()), SettleDailyIssueSummaryMonthRecord::getCompanyWechatId, adminUser.getCompanyWechatIds())
-                .eq(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), SettleDailyIssueSummaryMonthRecord::getWebsitNumber, adminUser.getAdminWebsitIds())
+                .in(CollectionUtil.isNotEmpty(adminUser.getCompanyWechatIds()), SettleDailyIssueSummaryMonthRecord::getCompanyWechatId, adminUser.getCompanyWechatIds())
+                .in(CollectionUtil.isNotEmpty(adminUser.getAdminWebsitIds()), SettleDailyIssueSummaryMonthRecord::getWebsitNumber, adminUser.getAdminWebsitIds())
                 .eq(StringUtils.isNotEmpty(summaryBatchNo), SettleDailyIssueSummaryMonthRecord::getSummaryBatchNo, summaryBatchNo)
                 .eq(StringUtils.isNotEmpty(summaryNumber), SettleDailyIssueSummaryMonthRecord::getSummaryNumber, summaryNumber)
                 .eq(Objects.isNull(status), SettleDailyIssueSummaryMonthRecord::getStatus, status)

mall-server-api/src/main/resources/mapper/DailyMapper.xml

@@ -188,23 +188,23 @@
 
     <select id="summaryDayList" resultType="com.gree.mall.manager.bean.settle.repair.DailySummaryDataBean">
         SELECT
-        id AS 'issueSalaryId',
-        summary_batch_no,
-        month,
-        COUNT(DISTINCT (service_number)) AS 'summaryNum',
-        SUM(repair_count) AS 'summaryOrderNum',
-        SUM(repair_total_amount) AS 'totalRepairCostC',
-        IF(FIND_IN_SET('4', GROUP_CONCAT(DISTINCT status)) > 0 || FIND_IN_SET('1', GROUP_CONCAT(DISTINCT status)) > 0, 1, status) AS 'status',
-        issue_time,
-        issue_by,
-        SUM(should_reduce_cost) AS 'reduceCostC',
-        SUM(incr_decr_cost) AS 'incrDecrCostC',
-        SUM(should_emp_insurance_cost) AS 'injuryCostC',
-        SUM(should_residual_insurance_cost) AS 'residualCostC',
-        SUM(withhold_cost) AS 'withholdCostC',
-        SUM(issue_cost) AS 'issueCostC',
-        summary_number,
-        summary_name
+            id AS 'issueSalaryId',
+            summary_batch_no,
+            month,
+            COUNT(DISTINCT (service_number)) AS 'summaryNum',
+            SUM(repair_count) AS 'summaryOrderNum',
+            SUM(repair_total_amount) AS 'totalRepairCostC',
+            IF(FIND_IN_SET('4', GROUP_CONCAT(DISTINCT status)) > 0 || FIND_IN_SET('1', GROUP_CONCAT(DISTINCT status)) > 0, 1, status) AS 'status',
+            issue_time,
+            issue_by,
+            SUM(should_reduce_cost) AS 'reduceCostC',
+            SUM(incr_decr_cost) AS 'incrDecrCostC',
+            SUM(should_emp_insurance_cost) AS 'injuryCostC',
+            SUM(should_residual_insurance_cost) AS 'residualCostC',
+            SUM(withhold_cost) AS 'withholdCostC',
+            SUM(issue_cost) AS 'issueCostC',
+            summary_number,
+            summary_name
         FROM
         settle_daily_issue_summary_record a
         <where>