1

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

@@ -7,8 +7,8 @@ ruoyi:
   # 版权年份
   copyrightYear: 2020
   # 文件路径 示例（ Windows配置D:/ruoyi/uploadPath，Linux配置 /home/ruoyi/uploadPath）
-#  profile: /home/admin/project/file
-  profile: D:/ruoyi/uploadPath
+  profile: /home/admin/project/file
+  # profile: D:/ruoyi/uploadPath
   # 获取ip地址开关
   addressEnabled: false
   #是否开启swagger

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

@@ -49,7 +49,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <include refid="selectAssRelcustomerinfoVo"/>
 
         WHERE
-            glfs != '开票方关联'
+        glfs != '开票方关联'
+        AND glfs != '用户关联'
         AND mainkunnr IN (
             SELECT
                 ar.mainkunnr
@@ -59,12 +60,34 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 1 = 1
             AND ( #{orgCode} = ar.mainkunnr OR #{orgCode} = ar.kunnr )
             and glfs  !='用户关联'
-            GROUP BY
+        glfs != '开票方关联'
+        GROUP BY
                 ar.mainkunnr
             )
-                or user_id=#{userId}
         GROUP BY
             kunnr
+        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 mainkunnr IN (
+        SELECT
+        ar.mainkunnr
+        FROM
+        ass_relcustomerinfo ar
+        WHERE
+        glfs != '开票方关联'
+        AND glfs = '用户关联'
+        and   user_id=#{userId}
+        AND ( #{orgCode} = ar.mainkunnr OR #{orgCode} = ar.kunnr )
+
+        GROUP BY
+        ar.mainkunnr
+        )
+
+        GROUP BY
+        kunnr
+
     </select>
 
     <select id="selectRelcustomerinfoByKunnr" resultMap="AssRelcustomerinfoResult">