weiaisuosi/nanguangszwlback
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'refs/remotes/origin/dev' into test

Browse Source 
# Conflicts:
#	mhd-gateway/src/main/resources/bootstrap.yml
#	mhd-modules/mhd-system/src/main/resources/bootstrap.yml
This commit is contained in:
王奎兴
2026-01-14 16:40:52 +08:00
parent 8b98c54d11 14cfad6b50
commit 84ab2c8bf9
136 changed files with 5275 additions and 861 deletions
Download Patch File Download Diff File Expand all files Collapse all files
mhd-user-center/src/main/resources/bootstrap.yml
+8 -4
View File
@@ -20,15 +20,19 @@ spring:
discovery:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
server-addr: 10.33.0.129:6010
# server-addr: 10.33.0.129:6010
#线上正式环境
# server-addr: 10.102.192.105:6848
server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
config:
# server-addr: 127.0.0.1:8848
# 线上测试环境配置 容器名+端口号
server-addr: 10.33.0.129:6010
# server-addr: 10.33.0.129:6010
#线上正式环境
# server-addr: 10.102.192.105:6848
server-addr: 10.102.192.5:6848
username: nacos
password: manhuoda@2023
group: DEFAULT_GROUP # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置
file-extension: yml #默认properties
# 共享配置
mhd-user-center/src/main/resources/mapper/MotorcadeMapper.xml
+30 -3
View File
@@ -209,8 +209,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<if test="organizationName != null and organizationName != ''">
and m.organization_name like concat('%', #{organizationName}, '%')
</if>
<if test="topOrganizationId != null and topOrganizationId != ''">
and top_organization_id = #{topOrganizationId}
<!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
<if test="organizationId != null">
<!-- 如果设置了 organizationId，添加 organization_id 条件 -->
and m.organization_id = #{organizationId}
and m.organization_name IS NOT NULL
</if>
<if test="topOrganizationId != null">
<!-- 如果设置了 topOrganizationId，添加 top_organization_id 条件 -->
and m.top_organization_id = #{topOrganizationId}
<if test="organizationId == null">
<!-- 如果没有设置 organizationId，添加 organization_name IS NOT NULL 条件 -->
and m.organization_name IS NOT NULL
</if>
</if>
<if test="organizationIdList != null ">
AND m.organization_id in
@@ -377,7 +388,23 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
LEFT JOIN
motorcade_driver d
ON m.motorcade_id = d.motorcade_id and d.del_flag = 1
where top_organization_id = #{organizationId} and m.del_flag = 1
<where>
m.del_flag = 1
<!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
<if test="organizationId != null">
<!-- 如果设置了 organizationId，添加 organization_id 条件 -->
and m.organization_id = #{organizationId}
and m.organization_name IS NOT NULL
</if>
<if test="topOrganizationId != null">
<!-- 如果设置了 topOrganizationId，添加 top_organization_id 条件 -->
and m.top_organization_id = #{topOrganizationId}
<if test="organizationId == null">
<!-- 如果没有设置 organizationId，添加 organization_name IS NOT NULL 条件 -->
and m.organization_name IS NOT NULL
</if>
</if>
</where>
</select>
</mapper>
mhd-user-center/src/main/resources/mapper/RoleMapper.xml
+13
View File
@@ -25,6 +25,8 @@
a.role_id,
a.parent_role_id,
a.organization_id,
a.organization_name AS organizationName,
a.top_organization_id AS topOrganizationId,
a.role_code,
a.role_name,
a.role_remark,
@@ -51,6 +53,7 @@
a.del_flag = 1
<include refid="common_where"></include>
GROUP BY a.role_id
ORDER BY COALESCE(a.update_time, a.create_time) DESC
</select>
<select id="selectByOrganizationIdAndRoleCode"
parameterType="com.mhd.user.domain.roleAggregate.repository.todo.RoleDo"
@@ -119,6 +122,16 @@
</if>
<if test="organizationId !=null">
and a.organization_id = #{organizationId}
and a.organization_name IS NOT NULL
</if>
<if test="topOrganizationId !=null">
and a.top_organization_id = #{topOrganizationId}
<if test="organizationId == null">
and a.organization_name IS NOT NULL
</if>
</if>
<if test="organizationName != null and organizationName != ''">
and a.organization_name like concat('%' , #{organizationName} , '%')
</if>
<if test="organizationIds !=null">
and a.organization_id in
mhd-user-center/src/main/resources/mapper/UserDriverMapper.xml
+4 -1
View File
@@ -703,7 +703,10 @@
<!-- </foreach>-->
<!-- </if>-->
<if test="userDriverDO.organizationId != null"> and b.organization_id = #{userDriverDO.organizationId}</if>
<if test="userDriverDO.organizationId != null">
and b.organization_id = #{userDriverDO.organizationId}
and b.organization_name IS NOT NULL
</if>
<if test="userDriverDO.createBy != null">
and (b.create_by = #{userDriverDO.createBy}
or b.user_id = #{userDriverDO.createBy}
mhd-user-center/src/main/resources/mapper/UserMapper.xml
+18 -8
View File
@@ -217,11 +217,19 @@
and a.user_id = #{userId}
</if>
<if test="organizationId !=null">
<!-- 数据权限：南光组织（organizationId=2827）查全部，其他组织查自己 -->
<if test="organizationId != null">
<!-- 如果设置了 organizationId，添加 organization_id 条件 -->
and a.organization_id = #{organizationId}
and a.organization_name IS NOT NULL
</if>
<if test="topOrganizationId !=null">
<if test="topOrganizationId != null">
<!-- 如果设置了 topOrganizationId，添加 top_organization_id 条件 -->
and a.top_organization_id = #{topOrganizationId}
<if test="organizationId == null">
<!-- 如果没有设置 organizationId，添加 organization_name IS NOT NULL 条件 -->
and a.organization_name IS NOT NULL
</if>
</if>
/*组织名称*/
<if test="organizationName != null and organizationName != ''">
@@ -708,7 +716,8 @@
</select>
<select id="findAllShipperInfo" resultType="com.mhd.user.interfaces.vo.QueryAllShipperInfoVo">
SELECT 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
SELECT 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 AS organizationId,u.top_organization_id AS topOrganizationId,
b.settlement_currency AS settlementCurrency
FROM "USER" u
LEFT JOIN user_shipper b ON u.user_id = b.user_id
left join (select user_id, LISTAGG(r.role_name, '&amp;') WITHIN GROUP(ORDER BY r.role_name) AS roleName
@@ -723,11 +732,12 @@
<if test="userId !=null">
AND u.user_Id = #{userId}
</if>
/*一级组织ID*/
<if test="topOrganizationId !=null">
AND u.top_organization_id = #{topOrganizationId}
/*组织ID - 数据隔离：南光组织（organizationId=2827）查询全部，其他组织查询自己组织的数据*/
<if test="organizationId !=null">
AND u.organization_id = #{organizationId}
AND u.organization_name IS NOT NULL
</if>
GROUP BY u.user_id
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
</select>
<select id="finShipperEnterpriseNamedByUserId" resultType="string">
SELECT
@@ -742,4 +752,4 @@
AND u.business_type IN (1, 3)
AND u.user_Id = #{userId}
</select>
</mapper>
</mapper>
mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml
+2 -1
View File
@@ -114,7 +114,8 @@
b.shipper_enterprisel_auth_id,
a.user_phone,
a.user_name,
a.organization_name,
a.organization_id AS organizationId,
a.organization_name AS organizationName,
a.user_account,
a.user_member_code,
a.user_idcard_number,