Merge remote-tracking branch 'origin/dev_jzg_lipf_cxbj_v20260416'

tenant/organization/src/main/java/com/jzg/organization/mapper/SysOrganizationUserLinkServiceMapper.java

@@ -3,11 +3,12 @@ package com.jzg.organization.mapper;
 
 import com.baomidou.mybatisplus.core.mapper.BaseMapper;
 import com.jzg.commons.entity.po.SysOrganizationUserLink;
+import org.apache.ibatis.annotations.Param;
 
 public interface SysOrganizationUserLinkServiceMapper extends BaseMapper<SysOrganizationUserLink> {
 
 
-    SysOrganizationUserLink getOrganizationUser(String userId);
+    SysOrganizationUserLink getOrganizationUser(@Param("userId") String userId,@Param("systemCode") String systemCode);
 
     void deleteOrganizationUser(String userId, String orgId);
 }

tenant/organization/src/main/java/com/jzg/organization/service/SysOrganizationUserLinkService.java

@@ -23,7 +23,7 @@ public interface SysOrganizationUserLinkService extends IService<SysOrganization
 
     SysOrganizationUserLink selectByOrgIdAndUserId(SysOrganizationUserLinkAdd organizationUserLinkAdd);
 
-    SysOrganizationUserLink getOrganizationUser(String userId);
+    SysOrganizationUserLink getOrganizationUser(String userId, String systemCode);
 
     void deleteOrganizationUser(String userId, String orgId);
 }

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationUserLinkServiceImpl.java

@@ -52,8 +52,8 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
     }
 
     @Override
-    public SysOrganizationUserLink getOrganizationUser(String userId) {
-        return sysOrganizationUserLinkServiceMapper.getOrganizationUser(userId);
+    public SysOrganizationUserLink getOrganizationUser(String userId, String systemCode) {
+        return sysOrganizationUserLinkServiceMapper.getOrganizationUser(userId,systemCode);
     }
 
     @Override

tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

@@ -986,7 +986,8 @@ public class SysUserServiceImpl extends ServiceImpl<SysUserMapper, SysUser> impl
             SysUserJzgInfo jzgInfo = sysUserJzgInfoService.getById(sysUserJzgInfo.getReferrerId());
             sysUserJzgInfo.setReferrerName(Objects.isNull(jzgInfo) ? "" : jzgInfo.getName());
         }
-        SysOrganizationUserLink sysOrganizationUserLink = sysOrganizationUserLinkService.getOrganizationUser( sysUserJzgInfo.getUserId());
+        String systemCode = baseController.getSystemCode();
+        SysOrganizationUserLink sysOrganizationUserLink = sysOrganizationUserLinkService.getOrganizationUser( sysUserJzgInfo.getUserId(),systemCode);
 
         if (!Objects.isNull(sysOrganizationUserLink)) {
             String organizationId = sysOrganizationUserLink.getOrganizationId();

tenant/organization/src/main/resources/mapper/SysOrganizationUserLinkServiceMapper.xml

@@ -25,9 +25,16 @@
     <!-- 根据用户ID获取组织关联信息 -->
     <select id="getOrganizationUser" resultMap="BaseResultMap">
         SELECT
-        <include refid="Base_Column_List"/>
-        FROM sys_organization_user_link
-        WHERE user_id = #{userId}
+        a.id,
+        a.user_id,
+        a.organization_id
+        FROM
+        platform_prod.sys_organization_user_link a
+        join platform_prod.sys_organization b on
+        a.organization_id = b.id
+        WHERE
+        user_id = #{userId,jdbcType=VARCHAR}
+        and b.system_code = #{systemCode,jdbcType=VARCHAR}
     </select>
 
 </mapper>

tenant/organization/src/main/resources/mapper/SysUserJzgInfoMapper.xml

@@ -82,7 +82,7 @@
         left join sys_user_role sur on sur.user_id = su.id
         left join sys_role sr on sr.id = sur.role_id
         left join sys_organization_user_link soul on soul.user_id = suji.user_id
-        left join sys_organization so on so.id = soul.organization_id
+        inner join sys_organization so on so.id = soul.organization_id
         LEFT JOIN sys_dept d ON suji.dept_id = d.id
         left join sys_user_jzg_info_salesman sujis on sujis.sys_user_jzg_info_id = suji.id
         where