Explorar el Código

1、调整课程会员与我的课程会员

yfh hace 22 horas
padre
commit
5e748bc601

+ 6 - 3
fs-company/src/main/java/com/fs/user/FsUserAdminController.java

@@ -41,9 +41,12 @@ public class FsUserAdminController extends BaseController {
         //startPage();
 
         LoginUser loginUser = tokenService.getLoginUser(ServletUtils.getRequest());
-        param.setCompanyId(loginUser.getCompany().getCompanyId());
-        param.setCompanyUserId(String.valueOf(loginUser.getUser().getUserId()));
-
+        if (param.isMyFsUser()){
+            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("当前销售不存在!");
         }

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

@@ -70,6 +70,10 @@ public class FsUserPageListParam implements Serializable {
      * 销售端登录用户id(该字段用于区分之前的登录用户)
      */
     private Long pcLoginUserId;
+    /**
+     * 是否为我的
+     */
+    private boolean isMyFsUser = true;