Merge branch 'wms_dev' into wms_dev_hbbf

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml

mhd-user-center/src/main/resources/bootstrap.yml

@@ -18,17 +18,17 @@ spring:
   cloud:
     nacos:
       discovery:
-#        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
         #        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.5:6848
+#        server-addr: 10.102.192.5:6848
         username: nacos
         password: manhuoda@2023
       config:
-#        server-addr: 127.0.0.1:8848
+        server-addr: 127.0.0.1:8848
         # 线上测试环境配置 容器名+端口号
         #        server-addr: 10.33.0.129:6010
-        server-addr: 10.102.192.5:6848
+#        server-addr: 10.102.192.5:6848
         username: nacos
         password: manhuoda@2023
         group: DEFAULT_GROUP  # 默认分组就是DEFAULT_GROUP，如果使用默认分组可以不配置

mhd-user-center/src/main/resources/mapper/UserMapper.xml

@@ -70,7 +70,16 @@
                a.department_id,
                a.ding_user_id,
                a.ding_dept_id,
-               a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code
+               a.validity_period_management,a.salesperson_nc_code,a.document_preparer_nc_code,
+               a.legal_representative,
+               a.unified_code,
+               a.registered_phone,
+               a.registered_address,
+               a.fax,
+               a.payment_bank,
+               a.payment_account,
+               a.invoice_title,
+               a.tax_number
         FROM "USER" a
         where a.del_flag = 1
     </sql>
@@ -131,6 +140,9 @@
         <include refid="selectUserVo"/>
         and a.top_organization_id = #{topOrganizationId}
         and a.user_account = #{userAccount}
+        <if test="roleCode != null and roleCode != ''">
+            and a.role_code = #{roleCode}
+        </if>
         <if test="userId !=null and userId !='' ">
             and a.user_id != #{userId}
         </if>
@@ -159,6 +171,10 @@
         and a.user_id = #{value}
     </select>
 
+    <select id="selectByUserName" parameterType="java.lang.String" resultType="com.mhd.common.core.domain.po.UserPo">
+        <include refid="selectUserVo"/>
+            and a.user_name = #{value}</select>
+
 
     <!-- 根据用户手机号查询自己以外的用户 -->
     <select id="findByTopOrganizationIdAndUserPhone"
@@ -170,6 +186,9 @@
         </if>
         and a.user_phone = #{userPhone}
         and a.top_organization_id = #{topOrganizationId}
+        <if test="roleCode != null and roleCode != ''">
+            and a.role_code = #{roleCode}
+        </if>
         <if test="userId !=null and userId !='' ">
             and a.user_id != #{userId}
         </if>
@@ -213,6 +232,13 @@
             OR a.create_by = #{createBy})
         </if>
 
+        <if test="userIds !=null and userIds.size() > 0 ">
+            and a.user_id in
+            <foreach item="id" collection="userIds" open="(" separator="," close=")">
+                #{id}
+            </foreach>
+        </if>
+
         <if test="userId !=null and userId !='' ">
             and a.user_id = #{userId}
         </if>
@@ -386,14 +412,6 @@
         <if test="userMemberCode != null and userMemberCode != ''">
          and a.user_member_code = #{userMemberCode}
          </if>
-        /*联系人*/
-        <if test="emergencyContactName != null and emergencyContactName != ''">
-            and a.emergency_contact_name = #{emergencyContactName}
-        </if>
-        /*联系电话*/
-        <if test="emergencyContactPhone != null and emergencyContactPhone != ''">
-            and a.emergency_contact_phone = #{emergencyContactPhone}
-        </if>
         /*详细地址*/
         <if test="userAreaAddress != null  and userAreaAddress != ''">
             and a.user_area_address like concat('%' , #{userAreaAddress} , '%')
@@ -406,6 +424,9 @@
         <if test="emergencyContactPhone != null  and emergencyContactPhone != ''">
             and a.emergency_contact_phone like concat('%' , #{emergencyContactPhone} , '%')
         </if>
+        <if test="userAreaCountyId != null  and userAreaCountyId != ''">
+            and a.user_area_county_id = #{userAreaCountyId}
+        </if>
     </sql>
 
     <select id="selectAppUserList" resultType="com.mhd.common.core.domain.po.app.UserAppPo" parameterType="com.mhd.user.domain.userAggregate.repository.todo.UserDO">

mhd-user-center/src/main/resources/mapper/UserShipperMapper.xml

@@ -381,4 +381,4 @@
         and esign_enterprise_status = #{userShipperEntity.esignEnterpriseStatus}
     </select>
 
-</mapper>
+</mapper>