管理端会员查询

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

@@ -0,0 +1,35 @@
+package com.fs.user;
+
+import com.fs.common.core.controller.BaseController;
+import com.fs.common.core.page.TableDataInfo;
+import com.fs.store.param.h5.FsUserPageListParam;
+import com.fs.store.service.IFsUserService;
+import com.fs.store.vo.h5.*;
+import io.swagger.annotations.Api;
+import io.swagger.annotations.ApiOperation;
+import lombok.AllArgsConstructor;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.access.prepost.PreAuthorize;
+import org.springframework.web.bind.annotation.*;
+import java.util.*;
+
+@Api(tags = "会员管理接口")
+@RestController
+@RequestMapping("/user/fsUser")
+@AllArgsConstructor
+public class FsUserAdminController extends BaseController {
+
+    @Autowired
+    private IFsUserService fsUserService;
+
+    @PreAuthorize("@ss.hasPermi('user:fsUser:list')")
+    @PostMapping("/list")
+    @ApiOperation("会员列表(与移动端使用的相同查询)")
+    public TableDataInfo pageList(@RequestBody FsUserPageListParam param) {
+        startPage();
+        List<FsUserPageListVO> list = fsUserService.selectFsUserPageList(param);
+        return getDataTable(list);
+    }
+
+
+}

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

@@ -49,5 +49,12 @@ public class FsUserPageListParam implements Serializable {
     @ApiModelProperty(value = "连续停课排序，0-连续缺课天数多到少；1-连续缺课天数少到多；2-按注册时间晚到早；3-会员姓名0-9-A-Z")
     private String continueMissCourseSort;
 
+    @ApiModelProperty(value = "昵称 (PC端使用)")
+    private String nickname;
+
+    @ApiModelProperty(value = "电话 (PC端使用)")
+    private String phone;
+
+
 }
 

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

@@ -398,7 +398,10 @@
         LEFT JOIN fs_user_course_count ON fs_user.user_id = fs_user_course_count.user_id
         LEFT JOIN company_tag_user ON fs_user.user_id = company_tag_user.user_id
         LEFT JOIN company_tag ON FIND_IN_SET(company_tag.tag_id, company_tag_user.tag_ids) > 0
-        where (company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        where 1 = 1
+        <if test="userId != null and userId !='' ">
+            and (company_user.user_id = #{userId} OR company_user.parent_id = #{userId} )
+        </if>
         <if test="companyUserId != null and companyUserId !='' ">
             and company_user.user_id = #{companyUserId}
         </if>