调整h5的获取销售、会员查询

fs-company-app/src/main/java/com/fs/app/controller/FsUserController.java

@@ -74,7 +74,7 @@ public class FsUserController extends AppBaseController {
     @GetMapping("/allCompanyUser")
     @ApiOperation("获取所有公司销售")
     public ResponseResult<List<CompanyUser>> getAllCompanyUser() {
-        List<CompanyUser> companyUsers = companyUserService.selectAllCompanyUserByParentId(Long.parseLong(getUserId()));
+        List<CompanyUser> companyUsers = companyUserService.selectAllCompanyUserAndSelf(Long.parseLong(getUserId()));
         return ResponseResult.ok(companyUsers);
     }
 

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

@@ -256,6 +256,8 @@ public interface CompanyUserMapper
 
     List<CompanyUser> selectAllCompanyUserByParentId(Long parentId);
 
+    List<CompanyUser> selectAllCompanyUserAndSelf(Long userId);
+
     /**
      * 批量审核用户
      * @param userIds 用户ID集合

fs-service-system/src/main/java/com/fs/company/service/ICompanyUserService.java

@@ -140,6 +140,8 @@ public interface ICompanyUserService {
 
     List<CompanyUser> selectAllCompanyUserByParentId(Long parentId);
 
+    List<CompanyUser> selectAllCompanyUserAndSelf(Long userId);
+
     /**
      * 批量审核用户
      * @param userIds 用户ID集合

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.selectAllCompanyUserByParentId(param != null ? param.getUserId() : null);
+        List<CompanyUser> companyUsers = companyUserMapper.selectAllCompanyUserAndSelf(param != null ? param.getUserId() : 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

@@ -408,6 +408,11 @@ public class CompanyUserServiceImpl implements ICompanyUserService
         return companyUserMapper.selectAllCompanyUserByParentId(parentId);
     }
 
+    @Override
+    public List<CompanyUser> selectAllCompanyUserAndSelf(Long userId) {
+        return companyUserMapper.selectAllCompanyUserAndSelf(userId);
+    }
+
     @Override
     public List<CompanyUser> getAllUserListLimit(Long companyId, String keywords) {
 

fs-service-system/src/main/java/com/fs/course/service/impl/FsUserCourseServiceImpl.java

@@ -730,7 +730,7 @@ public class FsUserCourseServiceImpl implements IFsUserCourseService
         CompanyUser companyUser = companyUserMapper.selectCompanyUserById(companyUserId);
 
         // 绘制推荐区域（图片和文字）
-        drawRecommendationArea(graphics, file, scaledHeight, companyUser != null ? companyUser.getUserName(): "云联融智", "邀请您成为会员");
+        drawRecommendationArea(graphics, file, scaledHeight, companyUser != null ? companyUser.getNickName(): "云联融智", "邀请您成为会员");
 
         // 绘制二维码
         drawQRCode(graphics, url, scaledWidth, totalHeight);

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

@@ -426,4 +426,14 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
     </update>
 
+    <select id="selectAllCompanyUserAndSelf" resultType="CompanyUser">
+        SELECT
+            *
+        FROM
+            company_user
+        WHERE
+            del_flag = 0
+          AND (company_user.user_id = #{userId} or company_user.parent_id = #{userId})
+    </select>
+
 </mapper>

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

@@ -569,14 +569,14 @@
                     AND DAY(fs_user_course_count.complete_watch_date) = DAY(NOW())
                 </when>
                 <when test = "tabValue == 3">
-                    AND fs_user_course_count.status = 3
+                    AND (fs_user_course_count.status = 3 or fs_user_course_count.status is null)
                 </when>
             </choose>
         </if>
         <if test="watchCourseType != null and watchCourseType !='' ">
             <choose>
                 <when test = "watchCourseType == 1">
-                    AND fs_user_course_count.status = 3
+                    AND (fs_user_course_count.status = 3 or fs_user_course_count.status is null)
                 </when>
                 <when test = "watchCourseType == 2">
                     AND fs_user_course_count.status = 1
@@ -592,7 +592,7 @@
                     AND fs_user_course_count.miss_course_status = 1
                 </when>
                 <when test = "missCourseStatus == 2">
-                    AND fs_user_course_count.miss_course_status = 2
+                    AND (fs_user_course_count.miss_course_status = 2 or fs_user_course_count.miss_course_status is null )
                 </when>
             </choose>
         </if>