1.7.5认证通版本功能优化

src/main/java/com/caimei/controller/wechat/WxAuthApi.java

@@ -377,22 +377,22 @@ public class WxAuthApi {
     @GetMapping("/get/published/video/list")
     public ResponseJson<PageInfo<ChallengeRoundVo>> getPublishedVideoList(@CurrentUser SysUser sysUser,Integer status,String clubUserName,Integer cursor,Integer count,@RequestParam(value = "pageNum", defaultValue = "1") Integer pageNum,
                                                                       @RequestParam(value = "pageSize", defaultValue = "10") Integer pageSize){
-        if (null == sysUser) {
-            return ResponseJson.error("用户信息异常", null);
-        }
-        // 获取供应商用户id
-        Integer userIdentity = sysUser.getUserIdentity();
-        Integer authUserId = 2 == userIdentity ? sysUser.getId() : 3 == userIdentity ? sysUser.getParentId() : null;
-        if (null == authUserId) {
-            return ResponseJson.error("供应商用户id不能为空", null);
-        }
+//        if (null == sysUser) {
+//            return ResponseJson.error("用户信息异常", null);
+//        }
+//        // 获取供应商用户id
+//        Integer userIdentity = sysUser.getUserIdentity();
+//        Integer authUserId = 2 == userIdentity ? sysUser.getId() : 3 == userIdentity ? sysUser.getParentId() : null;
+//        if (null == authUserId) {
+//            return ResponseJson.error("供应商用户id不能为空", null);
+//        }
         if(count==null){
             count=10;
         }
         if(cursor==null){
             cursor=0;
         }
-        return  authService.getPublishedVideoList(clubUserName,status,cursor,count,authUserId,pageNum,pageSize);
+        return  authService.getPublishedVideoList(clubUserName,status,cursor,count,pageNum,pageSize);
     }
 
     /**

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

@@ -134,7 +134,7 @@ public interface AuthMapper {
 
     Integer checkActivityTime(@Param("releaseTime") String releaseTime);
 
-    List<ChallengeRoundVo> getPublishedVideoList(@Param("clubUserName")String clubUserName,@Param("status")Integer status,@Param("authUserId")Integer authUserId);
+    List<ChallengeRoundVo> getPublishedVideoList(@Param("clubUserName")String clubUserName,@Param("status")Integer status);
 
     List<ChallengeRoundVo> getPublishedVideo(@Param("mobile")String mobile,@Param("authParty")String authParty,@Param("status")Integer status,@Param("authUserId")Integer authUserId);
 

src/main/java/com/caimei/service/auth/AuthService.java

@@ -189,7 +189,7 @@ public interface AuthService {
      * @param count
      * @return
      */
-    ResponseJson<PageInfo<ChallengeRoundVo>> getPublishedVideoList(String clubUserName,Integer status,Integer cursor,Integer count,Integer authUserId,Integer pageNum,Integer pageSize);
+    ResponseJson<PageInfo<ChallengeRoundVo>> getPublishedVideoList(String clubUserName,Integer status,Integer cursor,Integer count,Integer pageNum,Integer pageSize);
 
     /**
      * 获取已发布视频(后端)

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

@@ -1212,9 +1212,9 @@ public class AuthServiceImpl implements AuthService {
      * @return
      */
     @Override
-   public ResponseJson<PageInfo<ChallengeRoundVo>> getPublishedVideoList(String clubUserName,Integer status,Integer cursor,Integer count,Integer authUserId,Integer pageNum,Integer pageSize){
+   public ResponseJson<PageInfo<ChallengeRoundVo>> getPublishedVideoList(String clubUserName,Integer status,Integer cursor,Integer count,Integer pageNum,Integer pageSize){
         PageHelper.startPage(pageNum, pageSize);
-        List<ChallengeRoundVo> listChallengeRoundVo=authMapper.getPublishedVideoList(clubUserName,status,authUserId);
+        List<ChallengeRoundVo> listChallengeRoundVo=authMapper.getPublishedVideoList(clubUserName,status);
         PageInfo<ChallengeRoundVo> pageData = new PageInfo<>(listChallengeRoundVo);
         //调用抖音api获取视频数据
         String dyopenId=null;

src/main/resources/mapper/AuthMapper.xml

@@ -660,7 +660,7 @@
         select cr.id,cr.userName,cr.itemId,cr.title,cr.ossName,cr.ossUrl,cr.cover,cr.releaseTime,cr.status,cr.shareId,cr.authId,cba.authParty,cr.dyCommand
         from cm_challenge_round cr left join cm_brand_auth cba
         on cr.authId=cba.id
-               where cr.authUserId=#{authUserId}
+               where 1=1
         <if test="clubUserName != null and clubUserName != ''">
             and (cr.userName like concat('%', #{clubUserName})
             or  cba.authParty=#{clubUserName})