From 0d1b9f679c5a19583fe66792441ea5621fd6ee48 Mon Sep 17 00:00:00 2001
From: lzq <liuzhiqiang@yuhsoft.cn>
Date: Sat, 25 Oct 2025 15:42:47 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/resources/application-dev.yml        |  2 +-
 .../customer/service/CustomerService.java         | 15 +++++++--------
 .../main/resources/mapper/bs/StatisticsMapper.xml |  3 +--
 3 files changed, 9 insertions(+), 11 deletions(-)

diff --git a/njzscloud-localizer-svr/src/main/resources/application-dev.yml b/njzscloud-localizer-svr/src/main/resources/application-dev.yml
index 0a336be..73c7214 100644
--- a/njzscloud-localizer-svr/src/main/resources/application-dev.yml
+++ b/njzscloud-localizer-svr/src/main/resources/application-dev.yml
@@ -9,4 +9,4 @@ localizer:
   enabled: true
   boss-threads: 1
   worker-threads: 1
-  port: 30100
+  port: 10088
diff --git a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/service/CustomerService.java b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/service/CustomerService.java
index cadff98..540f9f9 100644
--- a/njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/service/CustomerService.java
+++ b/njzscloud-svr/src/main/java/com/njzscloud/supervisory/customer/service/CustomerService.java
@@ -22,7 +22,6 @@ import com.njzscloud.supervisory.customer.mapper.CustomerMapper;
 import com.njzscloud.supervisory.customer.pojo.param.SearchCustomerParam;
 import com.njzscloud.supervisory.customer.pojo.result.SearchCustomerResult;
 import com.njzscloud.supervisory.customer.pojo.result.ShortBargeInfoResult;
-import com.njzscloud.supervisory.order.contant.OrderStatus;
 import com.njzscloud.supervisory.sys.user.service.UserRoleService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -42,6 +41,12 @@ public class CustomerService {
     private final UserRoleService userRoleService;
     private final BizAuditConfigService bizAuditConfigService;
 
+    public static List<String> mergeLists(List<String> list1, List<String> list2) {
+        Set<String> set = new HashSet<>(list1);
+        set.addAll(list2);
+        return new ArrayList<>(set);
+    }
+
     public PageResult<SearchCustomerResult> paging(PageParam pageParam, SearchCustomerParam searchCustomerParam) {
         Page<SearchCustomerResult> page = pageParam.toPage();
         page.addOrder(OrderItem.desc("b.regdate"), OrderItem.desc("a.id"));
@@ -90,7 +95,7 @@ public class CustomerService {
 
         UserDetail userDetail = SecurityUtil.loginUser();
         Set<String> roles = userDetail.getRoles();
-        if (CollUtil.isNotEmpty(roles) && roles.contains(ROLE_JG)) {
+        if (CollUtil.isNotEmpty(roles) && !SecurityUtil.isAdmin() && roles.contains(ROLE_JG)) {
             List<String> areaList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getAreaRole, roles))
                     .stream().map(BizAuditConfigEntity::getArea).distinct().collect(Collectors.toList());
             List<String> cityList = bizAuditConfigService.list(Wrappers.<BizAuditConfigEntity>lambdaQuery().in(BizAuditConfigEntity::getCityRole, roles))
@@ -112,12 +117,6 @@ public class CustomerService {
         return PageResult.of(paging);
     }
 
-    public static List<String> mergeLists(List<String> list1, List<String> list2) {
-        Set<String> set = new HashSet<>(list1);
-        set.addAll(list2);
-        return new ArrayList<>(set);
-    }
-
     public void shortBarge(Boolean enable, Long customerId) {
         userRoleService.shortBarge(enable, customerId);
     }
diff --git a/njzscloud-svr/src/main/resources/mapper/bs/StatisticsMapper.xml b/njzscloud-svr/src/main/resources/mapper/bs/StatisticsMapper.xml
index 8be5ce2..1dc34f8 100644
--- a/njzscloud-svr/src/main/resources/mapper/bs/StatisticsMapper.xml
+++ b/njzscloud-svr/src/main/resources/mapper/bs/StatisticsMapper.xml
@@ -277,8 +277,7 @@
                  INNER JOIN goods_category e ON e.id = d.goods_category_id AND e.deleted = 0
                  INNER JOIN biz_company f ON f.id = a.station_id AND f.deleted = 0
                  INNER JOIN biz_company g ON g.id = a.trans_company_id AND g.deleted = 0
-        WHERE a.order_status = 'YiWanCheng'
-          AND a.deleted = 0
+        WHERE a.deleted = 0
         ORDER BY a.create_time DESC
         LIMIT 50
     </select>