From 7f92cc32ed8a2a08c74a6a8c871b5e1863dce458 Mon Sep 17 00:00:00 2001
From: xuhy <3313886187@qq.com>
Date: 星期二, 30 九月 2025 11:10:22 +0800
Subject: [PATCH] crm的bug修改
---
ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml | 2 +-
ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java | 8 +++++---
2 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
index 06c3444..703cb8e 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/TCrmBranchServiceImpl.java
@@ -97,9 +97,11 @@
if(!CollectionUtils.isEmpty(branchAreas)){
List<String> branchAreaCityCodes = branchAreas.stream().map(TCrmBranchArea::getCityCode).collect(Collectors.toList());
- long count = crmBranchAreaService.count(Wrappers.lambdaQuery(TCrmBranchArea.class).in(TCrmBranchArea::getCityCode, branchAreaCityCodes));
- if(count > 0){
- return R.fail("区域已存在");
+ if(!CollectionUtils.isEmpty(branchAreaCityCodes)){
+ long count = crmBranchAreaService.count(Wrappers.lambdaQuery(TCrmBranchArea.class).in(TCrmBranchArea::getCityCode, branchAreaCityCodes));
+ if(count > 0){
+ return R.fail("区域已存在");
+ }
}
}
diff --git a/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml b/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
index ce31a5a..5a1ffc5 100644
--- a/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
+++ b/ruoyi-system/src/main/resources/mapper/system/TErpIssueReportingMapper.xml
@@ -38,7 +38,7 @@
<if test="query.status != null">
AND status = #{query.status}
</if>
- <if test="query.reportType != null and query.query.reportUserId !=null">
+ <if test="query.reportType != null and query.reportUserId !=null">
AND report_type = #{query.reportType} and report_user_id =#{query.reportUserId}
</if>
<if test="query.createBy != null and query.createBy != ''">
--
Gitblit v1.7.1