组织机构列表

src/main/java/com/caimei/controller/LoginApi.java

@@ -40,7 +40,7 @@ public class LoginApi {
      */
     @ApiOperation("授权登录")
     @PostMapping("/authorization")
-   //@ApiImplicitParam(name = "params", value = "code登录凭证", required = true)
+    @ApiImplicitParam(name = "params", value = "code登录凭证", required = true)
     public ResponseJson<BuyerUserVo> authorizationLogin(@RequestBody String params) {
         JSONObject parseObject = JSONObject.parseObject(params);
         String code = parseObject.getString("code");

src/main/java/com/caimei/controller/ProductApi.java

@@ -3,7 +3,6 @@ package com.caimei.controller;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.vo.ClubVo;
 import com.caimei.service.ProductService;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiImplicitParam;
@@ -45,7 +44,7 @@ public class ProductApi {
             @ApiImplicitParam(name = "name", required = false, value = "机构名称/机构联系人")
     })
     @GetMapping("/clubList")
-    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, Page<ClubVo> page) {
-        return null;
+    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, int pageNum, int pageSize) {
+        return productService.clubList(organizeId, name, pageNum, pageSize);
     }
 }

src/main/java/com/caimei/mapper/LoginMapper.java

@@ -49,6 +49,7 @@ public interface LoginMapper {
     /**
      * 查询订单数量
      *
+     * @param organizeId 组织id
      * @param status
      * @return
      */

src/main/java/com/caimei/service/ProductService.java

@@ -2,7 +2,6 @@ package com.caimei.service;
 
 import com.caimei.model.ResponseJson;
 import com.caimei.model.vo.ClubVo;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageInfo;
 
 /**
@@ -17,7 +16,9 @@ public interface ProductService {
      *
      * @param name
      * @param organizeId
+     * @param pageSize
+     * @param pageNum
      * @return
      */
-    ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, Page<ClubVo> page);
+    ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, int pageNum, int pageSize);
 }

src/main/java/com/caimei/service/impl/ProductServiceImpl.java

@@ -4,7 +4,6 @@ import com.caimei.mapper.ProductMapper;
 import com.caimei.model.ResponseJson;
 import com.caimei.model.vo.ClubVo;
 import com.caimei.service.ProductService;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import org.springframework.stereotype.Service;
@@ -24,8 +23,8 @@ public class ProductServiceImpl implements ProductService {
     private ProductMapper productMapper;
 
     @Override
-    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, Page<ClubVo> page) {
-        PageHelper.startPage(page.getPageNum(),page.getPageSize());
+    public ResponseJson<PageInfo<ClubVo>> clubList(Integer organizeId, String name, int pageNum, int pageSize) {
+        PageHelper.startPage(pageNum, pageSize);
         List<ClubVo> clubList = productMapper.findClubList(organizeId, name);
         PageInfo<ClubVo> pageInfo = new PageInfo<>(clubList);
 

src/main/resources/mapper/LoginMapper.xml

@@ -47,7 +47,7 @@
         FROM
           cm_mall_organize
         WHERE
-          id =
+          id = #{organizeId}
           AND delFlag = 0
           AND status = 1
     </select>
@@ -74,19 +74,19 @@
         WHERE
         organizeID = #{organizeId}
         AND delFlag = '0'
-        <if test="orderState == 0">
+        <if test="status == 0">
             AND status = '0'
         </if>
-        <if test="orderState == 1">
+        <if test="status == 1">
             AND status IN(11,12,13,21,22,23)
         </if>
-        <if test="orderState == 2">
+        <if test="status == 2">
             AND status IN(11,12,21,22,31,32)
         </if>
-        <if test="orderState == 3">
+        <if test="status == 3">
             AND status IN(12,13,22,23,32,33)
         </if>
-        <if test="orderState == 4">
+        <if test="status == 4">
             AND refundType IN(1,2)
         </if>
     </select>

src/main/resources/mapper/ProductMapper.xml

@@ -16,10 +16,12 @@
           u.userOrganizeID = #{organizeId}
           AND u.clubStatus = 90
           AND u.validFlag = 1
-          AND (
-            u.name LIKE CONCAT("%",#{name}, "%")
-            OR u.userName LIKE CONCAT("%",#{name}, "%")
-          )
+          <if test="name != null and name != ''">
+              AND (
+                u.name LIKE CONCAT("%",#{name}, "%")
+                OR u.userName LIKE CONCAT("%",#{name}, "%")
+              )
+          </if>
     </select>
 
 </mapper>