看课统计，会员筛选

fs-admin/src/main/java/com/fs/company/controller/CompanyUserController.java

@@ -56,6 +56,19 @@ public class CompanyUserController extends BaseController
         return util.exportExcel(list, "companyUser");
     }
 
+    /**
+     * 获取所有的销售列表
+     * @param companyId
+     * @return
+     */
+    @GetMapping("/getUserList")
+    public R getUserList(@RequestParam("companyId") Long companyId)
+    {
+        CompanyUser map=new CompanyUser();
+        map.setCompanyId(companyId);
+        List<CompanyUser> list = companyUserService.selectCompanyUserList(map);
+        return  R.ok().put("data",list);
+    }
     /**
      * 获取企业员工信息详细信息
      */

fs-admin/src/main/java/com/fs/course/controller/FsCourseWatchLogController.java

@@ -74,11 +74,14 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/statisticsList")
     public TableDataInfo statisticsList(FsCourseWatchLogStatisticsListParam param)
     {
+        // 如果看指定用户就不用设置公司
         if(param.getCompanyId() == null){
-            throw new CustomException("必须选择公司!");
+            if(param.getUserId() == null) {
+                throw new CustomException("查看公司或者用户必填！");
+            }
         }
         if (param.getSTime()==null||param.getETime()==null){
-            return getDataTable(new ArrayList<>());
+            throw new CustomException("必须选择开始时间和结束时间！");
         }
         List<FsCourseWatchLogStatisticsListVO> list = fsCourseWatchLogService.selectFsCourseWatchLogStatisticsListVONew(param);
         TableDataInfo rspData = new TableDataInfo();
@@ -138,7 +141,6 @@ public class FsCourseWatchLogController extends BaseController
     public TableDataInfo watchLogStatistics(FsCourseOverParam param)
     {
         startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }
@@ -148,7 +150,6 @@ public class FsCourseWatchLogController extends BaseController
     @GetMapping("/watchLogStatisticsExport")
     public AjaxResult watchLogStatisticsExport(FsCourseOverParam param)
     {
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if (param.getSTime()==null||param.getETime()==null){
             return AjaxResult.error("请选择时间");
         }

fs-admin/src/main/java/com/fs/course/controller/qw/QwFsCourseWatchLogController.java

@@ -75,7 +75,6 @@ public class QwFsCourseWatchLogController extends BaseController
     public TableDataInfo statisticsList(FsCourseWatchLogStatisticsListParam param)
     {
         startPage();
-        LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
         if (param.getSTime()==null||param.getETime()==null){
             return getDataTable(new ArrayList<>());
         }

fs-admin/src/main/java/com/fs/store/controller/FsUserController.java

@@ -80,7 +80,18 @@ public class FsUserController extends BaseController
     {
         return AjaxResult.success(fsUserService.selectFsUserByUserId(userId));
     }
-
+    /**
+     * 查询企业内的用户，每次只返回5条
+     * @param fsUser 查询参数
+     * @return R
+     */
+    @GetMapping("/getUserListLimit")
+    public R getUserListLimit( FsUser fsUser)
+    {
+        fsUser.setIsDel(0);
+        List<FsUser> list=fsUserService.getUserListLimit(fsUser);
+        return R.ok().put("data", list);
+    }
     /**
      * 新增用户
      */

fs-service-system/src/main/java/com/fs/store/domain/FsStoreProduct.java

@@ -4,6 +4,7 @@ import java.math.BigDecimal;
 import com.fs.common.annotation.Excel;
 import com.fs.common.core.domain.BaseEntity;
 import lombok.Data;
+import lombok.EqualsAndHashCode;
 
 /**
  * 商品对象 fs_store_product
@@ -11,6 +12,7 @@ import lombok.Data;
  * @author fs
  * @date 2022-03-15
  */
+@EqualsAndHashCode(callSuper = true)
 @Data
 public class FsStoreProduct extends BaseEntity
 {

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

@@ -251,6 +251,7 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
             product.setIntegral(Long.parseLong(countDto.getMinIntegral().toString()));
             product.setStock(Long.parseLong(countDto.getStock().toString()));
             product.setCompanyIds(param.getCompanyIds());
+            product.setVideo(param.getVideo());
             fsStoreProductMapper.updateFsStoreProduct(product);
             if (param.getSpecType().equals(0)) {
                 ProductArrtDTO fromatDetailDto = ProductArrtDTO.builder()
@@ -274,6 +275,7 @@ public class FsStoreProductServiceImpl implements IFsStoreProductService
             product.setIntegral(Long.parseLong(countDto.getMinIntegral().toString()));
             product.setStock(Long.parseLong(countDto.getStock().toString()));
             product.setCompanyIds(param.getCompanyIds());
+            product.setVideo(param.getVideo());
             fsStoreProductMapper.insertFsStoreProduct(product);
             if (param.getSpecType().equals(0)) {
                 ProductArrtDTO fromatDetailDto = ProductArrtDTO.builder()