经销商关联修改

suishenbang-api/src/main/resources/application-uat.yml

@@ -31,7 +31,7 @@ libang:
 # 开发环境配置
 server:
   # 服务器的HTTP端口，默认为80
-  port: 10003
+  port: 10001
   servlet:
     # 应用的访问路径
     context-path: /wxportal-api

suishenbang-system/src/main/resources/mapper/system/AssRelcustomerinfoMapper.xml

@@ -60,16 +60,19 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 1 = 1
             AND ( #{orgCode} = ar.mainkunnr OR #{orgCode} = ar.kunnr )
             and glfs  !='用户关联'
-        glfs != '开票方关联'
+            and glfs != '开票方关联'
         GROUP BY
                 ar.mainkunnr
             )
         GROUP BY
             kunnr
+
+        union
         select id, create_by, create_time, update_by, update_time, is_delete, mainkunnr, mainname1, kunnr, name1, glfs, glsj, enddate, ETL_createtime,user_id,customer_type from ass_relcustomerinfo
         WHERE
         glfs != '开票方关联'
         AND glfs = '用户关联'
+        and   user_id=#{userId}
         AND mainkunnr IN (
         SELECT
         ar.mainkunnr