zyp

fs-service/src/main/java/com/fs/company/mapper/CompanyUserMapper.java

@@ -214,7 +214,7 @@ public interface CompanyUserMapper
     @Select("select domain from company_user where user_id = #{userId}")
     String selectDomainByUserId(Long userId);
 
-    List<CompanyUser> selectAllCompanyUserAndSelf(@Param("userId") Long userId);
+    List<CompanyUser> selectAllCompanyUserAndSelf(@Param("userId") Long userId,@Param("companyId") Long companyId);
 
     @Select("select * from company_user where company_id=#{companyId} and del_flag=0")
     List<CompanyUser> selectCompanyUserByCompanyId(Long companyId);

fs-service/src/main/java/com/fs/company/service/impl/CompanyTagUserServiceImpl.java

@@ -118,7 +118,7 @@ public class CompanyTagUserServiceImpl implements ICompanyTagUserService
             }
         }
         //获取所有销售
-        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUserAndSelf(param != null ? param.getUserId() : null);
+        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUserAndSelf(param != null ? param.getUserId() : null,null);
         List<Long> userIds = Collections.emptyList();
         if(companyUsers != null && !companyUsers.isEmpty()){
             userIds = companyUsers.stream().map(CompanyUser::getUserId).collect(Collectors.toList());

fs-service/src/main/java/com/fs/company/service/impl/CompanyUserServiceImpl.java

@@ -452,7 +452,14 @@ public class CompanyUserServiceImpl implements ICompanyUserService
 
     @Override
     public List<CompanyUser> selectAllCompanyUserAndSelf(Long userId) {
-        return companyUserMapper.selectAllCompanyUserAndSelf(userId);
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(userId);
+        List<CompanyUser> list = new ArrayList<>();
+        if (companyUser.isAdmin()){
+            list = companyUserMapper.selectAllCompanyUserAndSelf(userId,companyUser.getCompanyId());
+        }else {
+            list =   companyUserMapper.selectAllCompanyUserAndSelf(userId,null);
+        }
+        return list;
     }
 
     /**

fs-service/src/main/resources/mapper/company/CompanyUserMapper.xml

@@ -260,9 +260,15 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             *
         FROM
             company_user
-        WHERE
+        <where>
             del_flag = 0
-          AND (company_user.user_id = #{userId} or company_user.parent_id = #{userId})
+            <if test="companyId == null">
+                AND (company_user.user_id = #{userId} or company_user.parent_id = #{userId})
+            </if>
+            <if test="companyId != null">
+                AND company_user.company_id = #{companyId}
+            </if>
+        </where>
     </select>
     <select id="getAllUserListLimit" resultType="com.fs.company.domain.CompanyUser">
         SELECT * FROM company_user