From 31247d7faa846fcebcc4ff976fdb1fbb738b6f8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=B5=B5=E8=BE=89?= <2830717623@qq.com>
Date: Tue, 23 Jun 2026 08:57:06 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A7=94=E6=89=98=E6=96=B9=E5=A2=9E=E5=8A=A0?=
=?UTF-8?q?=E7=BB=84=E7=BB=87=E4=BB=A3=E7=A0=81=EF=BC=8C=E4=B8=8E=E6=9F=A5?=
=?UTF-8?q?=E8=AF=A2=E4=BF=AE=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../userAggregate/entity/UserShipperEntity.java | 3 +++
.../userAggregate/repository/po/UserShipperPo.java | 2 ++
.../userAggregate/repository/todo/UserShipperDO.java | 3 +++
.../user/interfaces/dto/addDTO/UserShipperDTO.java | 3 +++
.../src/main/resources/mapper/UserMapper.xml | 8 +++++++-
.../src/main/resources/mapper/UserShipperMapper.xml | 12 ++++++++++--
6 files changed, 28 insertions(+), 3 deletions(-)
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
index fc8e6a274..56f93c213 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/entity/UserShipperEntity.java
@@ -291,4 +291,7 @@ public class UserShipperEntity extends BaseVOEntity {
@ApiModelProperty(name = "是否校验信用")
private String isCheckCredit;
+ @ApiModelProperty(name = "组织代码")
+ private String orgCode;
+
}
\ No newline at end of file
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java
index 15958b775..8d6869c92 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/po/UserShipperPo.java
@@ -354,4 +354,6 @@ public class UserShipperPo implements Serializable {
private BigDecimal agreementCount;
@ApiModelProperty(name = "是否校验信用")
private String isCheckCredit;
+ @ApiModelProperty(name = "组织代码")
+ private String orgCode;
}
\ No newline at end of file
diff --git a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
index 73d309227..e96c43d8c 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/todo/UserShipperDO.java
@@ -322,4 +322,7 @@ public class UserShipperDO extends UserDO {
private String userPassword;
@ApiModelProperty(name = "是否校验信用")
private String isCheckCredit;
+
+ @ApiModelProperty(name = "组织代码")
+ private String orgCode;
}
\ No newline at end of file
diff --git a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java
index e3717759d..50bf04ab3 100644
--- a/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java
+++ b/mhd-user-center/src/main/java/com/mhd/user/interfaces/dto/addDTO/UserShipperDTO.java
@@ -268,4 +268,7 @@ public class UserShipperDTO extends UserDTO {
private String userPassword;
@ApiModelProperty(name = "是否校验信用")
private String isCheckCredit;
+
+ @ApiModelProperty(name = "组织代码")
+ private String orgCode;
}
\ No newline at end of file
diff --git a/mhd-user-center/src/main/resources/mapper/UserMapper.xml b/mhd-user-center/src/main/resources/mapper/UserMapper.xml
index 8e7d02061..a0799d041 100644
--- a/mhd-user-center/src/main/resources/mapper/UserMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserMapper.xml
@@ -773,7 +773,13 @@
/*组织ID - 数据隔离：南光组织（organizationId=2827）查询全部，其他组织查询自己组织的数据*/
- AND u.organization_id = #{organizationId}
+ AND (
+ u.organization_id = #{organizationId}
+ OR b.org_code LIKE concat('%"code":"', #{organizationId}, '"%')
+ OR b.org_code LIKE concat('%code:', #{organizationId}, '%')
+ OR b.org_code LIKE concat('%code: ', #{organizationId}, '%')
+ OR b.org_code LIKE concat('%"code":', #{organizationId}, '%')
+ )
AND u.organization_name IS NOT NULL
GROUP BY u.user_id, u.user_name, u.user_area_address, u.user_area_county_id, u.user_area_name, u.user_phone, u.has_default_address, b.shipper_id, b.shipper_enterprise_name, u.DOCUMENT_PREPARER_NC_CODE, b.CUSTOMER_NC_CODE, u.organization_id, u.top_organization_id, b.settlement_currency
diff --git a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
index 0e9754f99..37bbc4c9b 100644
--- a/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+++ b/mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
@@ -171,7 +171,8 @@
b.LIMIT_TIME,
b.CREDIT_AMOUNT,
b.IS_CHECK_CREDIT,
- b.AGREEMENT_COUNT
+ b.AGREEMENT_COUNT,
+ b.org_code
FROM "USER" a
LEFT JOIN user_shipper b ON a.user_id = b.user_id
left join (select user_id, LISTAGG(DISTINCT r.role_name, '&') WITHIN GROUP(ORDER BY r.role_name) AS roleName
@@ -375,7 +376,13 @@
/*用户组织ID*/
- and a.organization_id = #{organizationId}
+ AND (
+ a.organization_id = #{organizationId}
+ OR b.org_code LIKE concat('%"code":"', #{organizationId}, '"%')
+ OR b.org_code LIKE concat('%code:', #{organizationId}, '%')
+ OR b.org_code LIKE concat('%code: ', #{organizationId}, '%')
+ OR b.org_code LIKE concat('%"code":', #{organizationId}, '%')
+ )
/*组织名称*/
@@ -511,6 +518,7 @@
OR a.create_by = #{createBy})
+