bugfix

src/main/java/com/caimei/mapper/cmMapper/ClubMapper.java

@@ -21,6 +21,8 @@ public interface ClubMapper {
 
     List<ClubUserVo> getNotCertifiedClubUserList(@Param("authUserId") Integer authUserId, @Param("mobile") String mobile, String name, @Param("status") Integer status,Integer authenticationStatus);
 
+    List<ClubUserVo> getAllCertifiedClubUserList(@Param("authUserId") Integer authUserId, @Param("mobile") String mobile, String name, @Param("status") Integer status);
+
     List<ClubUserVo> getmobile(Integer authUserId);
     void insertClubUser(ClubUserPo clubUser);
 

src/main/java/com/caimei/service/auth/impl/AuthClubServiceImpl.java

@@ -59,6 +59,13 @@ public class AuthClubServiceImpl implements AuthClubService {
     @Override
     public ResponseJson<PageInfo<ClubUserVo>> getClubUserList(Integer authUserId, String mobile, String name, Integer status, Integer pageNum, Integer pageSize,Integer authenticationStatus) {
        //判断筛选条件是否是认证机构
+        if(null==authenticationStatus){
+            //查询全部
+            PageHelper.startPage(pageNum, pageSize);
+            List<ClubUserVo> clubUserList = clubMapper.getAllCertifiedClubUserList(authUserId, mobile, name, status);
+            PageInfo<ClubUserVo> pageData = new PageInfo<>(clubUserList);
+            return ResponseJson.success(pageData);
+        }
         if(authenticationStatus==0){
             //查询未认证的机构
             PageHelper.startPage(pageNum, pageSize);

src/main/java/com/caimei/service/auth/impl/DownloadServiceImpl.java

@@ -362,7 +362,7 @@ public class DownloadServiceImpl implements DownloadService {
             // 创建列头行
             XSSFRow authTopRow = authPartySheet.createRow(0);
             // 添加列头单元格
-            String[] rowName = {"机构名称（必填）", "所在地区（必填）", "详细地址（必填）", "经纬度（必填）",
+            String[] rowName = {"机构名称（必填）", "所在地区（必填）", "详细地址（必填）", "经纬度（选填）",
                     "联系电话（必填）", "认证编号（选填）", "认证日期（选填）", "员工人数（必填）", "店铺备注（选填）"};
             for (int i = 0; i < rowName.length; i++) {
                 XSSFCell authTopRowCell = authTopRow.createCell(i);

src/main/resources/mapper/ClubMapper.xml

@@ -49,6 +49,31 @@
         </if>
         order by createTime desc
     </select>
+    <select id="getAllCertifiedClubUserList" resultType="com.caimei.model.vo.ClubUserVo">
+        select cu.id as clubUserId,
+        cu.authId,
+        cu.name,
+        cu.mobile,
+        cu.addTime,
+        cu.nickName,
+        cu.openId,
+        cu.status
+        from cm_brand_club_user cu
+        left join cm_brand_auth a on cu.authId = a.id
+        where cu.authUserId = #{authUserId}
+        and cu.delFlag = 0
+        and (a.id is null || a.delFlag = 0)
+        <if test="name != null and name != ''">
+            and cu.name like concat('%',#{name},'%')
+        </if>
+        <if test="mobile != null and mobile != ''">
+            and cu.mobile like concat('%',#{mobile},'%')
+        </if>
+        <if test="status != null">
+            and cu.status = #{status}
+        </if>
+        order by cu.addTime desc
+    </select>
     <select id="getClubUserList" resultType="com.caimei.model.vo.ClubUserVo">
         select cu.id as clubUserId,
         cu.authId,