Просмотр исходного кода

应付账款-业务员账户

审核不通过界面应该加个驳回原因/驳回时间
lipf 5 месяцев назад
Родитель
Сommit
05fb88bedb

+ 3 - 1
tenant/organization/src/main/java/com/jzg/organization/mapper/SysOrganizationUserLinkServiceMapper.java

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

+ 1 - 1
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, String systemCode);
+    SysOrganizationUserLink getOrganizationUser(Long userId, String systemCode);
 
     void deleteOrganizationUser(String userId, String orgId);
 }

+ 6 - 2
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysOrganizationUserLinkServiceImpl.java

@@ -1,5 +1,6 @@
 package com.jzg.organization.service.impl;
 
+import cn.hutool.core.collection.CollUtil;
 import cn.hutool.json.JSONUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
@@ -14,6 +15,8 @@ import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
+import java.util.List;
+
 @Service
 public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizationUserLinkServiceMapper, SysOrganizationUserLink> implements SysOrganizationUserLinkService{
 
@@ -52,8 +55,9 @@ public class SysOrganizationUserLinkServiceImpl extends ServiceImpl<SysOrganizat
     }
 
     @Override
-    public SysOrganizationUserLink getOrganizationUser(String userId, String systemCode) {
-        return sysOrganizationUserLinkServiceMapper.getOrganizationUser(userId,systemCode);
+    public SysOrganizationUserLink getOrganizationUser(Long userId, String systemCode) {
+        List<SysOrganizationUserLink> organizationUser = sysOrganizationUserLinkServiceMapper.getOrganizationUser(userId, systemCode);
+        return CollUtil.getFirst(organizationUser);
     }
 
     @Override

+ 2 - 1
tenant/organization/src/main/java/com/jzg/organization/service/impl/SysUserServiceImpl.java

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

+ 4 - 4
tenant/organization/src/main/resources/mapper/SysOrganizationUserLinkServiceMapper.xml

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