Merge branch 'feature/0721-tenant' of http://git.dayaedu.com/yonge/cooleshow into feature/0721-tenant

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/SysUserFeignService.java

@@ -54,9 +54,9 @@ public interface SysUserFeignService {
 										   @RequestParam("clientId")String clientId,
 										   @RequestParam("clientSecret")String clientSecret);
 
-	@GetMapping(value = "user/getTenantByClient")
+	@PostMapping(value = "user/getTenantByClient")
 	@ApiOperation(value = "获取机构编号")
-	Long getTenantByClient(@RequestParam("userId")Long userId,@RequestParam("clientId")String clientId);
+	HttpResponseResult<Long> getTenantByClient(@RequestParam("userId")Long userId,@RequestParam("clientId")String clientId);
 
 	@GetMapping(value = "exit")
 	@ApiOperation(value = "退出登录")

cooleshow-auth/auth-api/src/main/java/com/yonge/cooleshow/auth/api/client/fallback/SysUserFeignServiceFallback.java

@@ -68,8 +68,8 @@ public class SysUserFeignServiceFallback implements SysUserFeignService {
 		return HttpResponseResult.failed("请求失败");
 	}
 
-	public Long getTenantByClient(Long userId,String clientId){
-		return -1l;
+	public HttpResponseResult<Long> getTenantByClient(Long userId,String clientId){
+		return HttpResponseResult.succeed(-1L);
 	}
 
 	@Override

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/web/controller/UserController.java

@@ -135,9 +135,9 @@ public class UserController extends BaseController {
         return sysUserService.get(userId);
     }
 
-    @GetMapping(value = "/getTenantByClient")
-    public Long getTenantByClient(Long userId,String clientId) {
-        return sysUserService.getTenantByClient(userId,clientId);
+    @PostMapping(value = "/getTenantByClient", consumes = MediaType.APPLICATION_FORM_URLENCODED_VALUE)
+    public HttpResponseResult<Long> getTenantByClient(Long userId,String clientId) {
+        return HttpResponseResult.succeed(sysUserService.getTenantByClient(userId,clientId));
     }
 
     @PostMapping(value = "/updateSysUser", consumes = MediaType.APPLICATION_JSON_VALUE)

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/service/impl/SysUserServiceImpl.java

@@ -62,7 +62,7 @@ public class SysUserServiceImpl implements SysUserService {
 
     @Override
     public Long getTenantByClient(Long userId, String clientId) {
-        return sysUserFeignService.getTenantByClient(userId,clientId);
+        return sysUserFeignService.getTenantByClient(userId,clientId).getData();
     }
 
     @Override

cooleshow-user/user-biz/src/main/resources/config/mybatis/TenantAlbumMusicMapper.xml

@@ -70,7 +70,7 @@
               and  t.tenant_album_id_ = #{albumId}
             </if>
         </where>
-
+        order by t.sort_number_ asc
 
     </select>