Merge branch 'developerA' into developer

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

@@ -528,8 +528,18 @@ public class WxAuthApi {
      * @return
      */
     @GetMapping("/get/video/username")
-    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(String mobile,Integer clubUserId,Integer authUserId){
-        return authService.getVideoByUsername(mobile,clubUserId,authUserId);
+    public ResponseJson<List<RossChallengeVideo>> getVideoByUsername(@CurrentUser SysUser sysUser,String mobile,Integer clubUserId,Integer authUserId){
+                if (null == sysUser) {
+            return ResponseJson.error("用户信息异常", null);
+        }
+                Integer id=authUserId;
+        // 获取供应商用户id
+        Integer userIdentity = sysUser.getUserIdentity();
+        Integer UserId = 2 == userIdentity ? sysUser.getId() : 3 == userIdentity ? sysUser.getParentId() : null;
+        if (null == authUserId) {
+            id=UserId;
+        }
+        return authService.getVideoByUsername(mobile,clubUserId,id);
     }
 
     /**