课程会员,红包统计

fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -53,15 +53,15 @@ public class FsUserAdminController extends BaseController {
         //startPage();
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        if (param.isMyFsUser()){
+        if (param.getIsMyFsUser()){
             param.setCompanyId(loginUser.getCompany().getCompanyId());
             param.setCompanyUserId(String.valueOf(loginUser.getUser().getUserId()));
         }else {
             param.setCompanyId(loginUser.getCompany().getCompanyId());
         }
-        if(param.getCompanyUserId() == null) {
-            throw new IllegalArgumentException("当前销售不存在！");
-        }
+//        if(param.getCompanyUserId() == null) {
+//            throw new IllegalArgumentException("当前销售不存在！");
+//        }
         return fsUserService.selectFsUserPageListNew(param);
     }
 

fs-service/src/main/java/com/fs/store/param/h5/FsUserPageListParam.java

@@ -73,7 +73,7 @@ public class FsUserPageListParam implements Serializable {
     /**
      * 是否为我的
      */
-    private boolean isMyFsUser = true;
+    private Boolean isMyFsUser = Boolean.TRUE;
 
 
 

fs-service/src/main/resources/mapper/his/FsUserMapper.xml

@@ -1210,7 +1210,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_course_red_packet_log flog
         LEFT JOIN fs_user ON fs_user.user_id = flog.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-        <where>
+        where flog.status = 1
             <if test="userId != null and userId != 0 ">
                 and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
             </if>
@@ -1233,7 +1233,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserId != null and companyUserId != ''">
                 AND company_user.user_id = #{companyUserId}
             </if>
-        </where>
         ) AS redPacketNum,
         (
         SELECT
@@ -1242,7 +1241,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         fs_course_red_packet_log flog
         LEFT JOIN fs_user ON fs_user.user_id = flog.user_id
         LEFT JOIN company_user ON company_user.user_id = fs_user.company_user_id
-        <where>
+        where flog.status = 1
             <if test="userId != null and userId != 0 ">
                 and (fs_user.company_user_id = #{userId} OR company_user.parent_id = #{userId} )
             </if>
@@ -1265,7 +1264,6 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
             <if test="companyUserId != null and companyUserId != ''">
                 AND company_user.user_id = #{companyUserId}
             </if>
-        </where>
         ) AS redPacketAmount
     </select>