zyp

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

@@ -225,7 +225,7 @@ public interface CompanyUserMapper
 
     List<CompanyUser> selectAllCompanyUserByParentId(Long parentId);
 
-    List<CompanyUser> selectAllCompanyUserAndSelf(Long userId);
+    List<CompanyUser> selectAllCompanyUserAndSelf(@Param("userId") Long userId,@Param("companyId") Long companyId);
 
     /**
      * 批量审核用户

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

@@ -119,7 +119,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-system/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;
     }
 
     @Override

fs-service-system/src/main/java/com/fs/store/service/impl/FsUserServiceImpl.java

@@ -468,6 +468,12 @@ public class FsUserServiceImpl implements IFsUserService
 
     @Override
     public PageInfo<FsUserPageListVO> selectFsUserPageList(FsUserPageListParam param) {
+
+        CompanyUser companyUser = companyUserMapper.selectCompanyUserById(param.getUserId());
+        if (companyUser.isAdmin()){
+            param.setUserId(0L);
+            param.setCompanyId(companyUser.getCompanyId());
+        }
         List<FsUserPageListVO> fsUserPageListVOS = fsUserMapper.selectFsUserPageList(param);
 
         // 获取当前销售所有重粉会员

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

@@ -440,12 +440,18 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
 
     <select id="selectAllCompanyUserAndSelf" resultType="CompanyUser">
         SELECT
-            *
+        *
         FROM
-            company_user
-        WHERE
+        company_user
+        <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="selectQwWatchLogStatisticsListVONewCount" resultType="java.lang.Long">
 

fs-service-system/src/main/resources/mapper/store/FsUserMapper.xml

@@ -527,11 +527,11 @@
         LEFT JOIN fs_user_company_user ON fs_user_company_user.user_id = fs_user.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user_company_user.company_user_id
         where fs_user.is_del = 0
-        <if test="userId != null and userId !='' ">
-            and (company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        <if test="userId != null and userId!= 0 ">
+            and fs_user.company_user_id = #{userId}
         </if>
-        <if test="companyUserId != null and companyUserId !='' ">
-            and company_user.user_id = #{companyUserId}
+        <if test="companyId != null ">
+            and fs_user.company_id = #{companyId}
         </if>
         <choose>
             <when test = "isBlack">