Merge branch 'develop' of http://git.dayaedu.com/yonge/cooleshow into develop

cooleshow-app/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTenantController.java

@@ -71,9 +71,9 @@ public class OpenTenantController {
         // 根据手机号 判断是否已经有机构账户
         TenantStaff tenantStaff = tenantStaffService.getByPhone(phone);
         if (tenantStaff != null) {
-            return HttpResponseResult.status(true);
+            return HttpResponseResult.succeed(true);
         }
-        return HttpResponseResult.status(false);
+        return HttpResponseResult.succeed(false);
     }
 
 

cooleshow-user/user-admin/src/main/java/com/yonge/cooleshow/admin/controller/TenantAlbumController.java

@@ -197,7 +197,7 @@ public class TenantAlbumController {
             List<Long> musicIds = album.getMusicSheetData().stream().flatMap(o -> o.getMusicSheetList().stream().map(m -> m.getId())).collect(Collectors.toList());
             Set<Long> musicSet = new HashSet<>(musicIds);
             if (musicSet.size() < musicIds.size()) {
-                throw new BizException("不予许添加相同的曲目");
+                throw new BizException("不能添加相同的曲目");
             }
         }
 
@@ -246,7 +246,7 @@ public class TenantAlbumController {
                     .stream().map(TenantAlbumVo.MusicObject::getId)).collect(Collectors.toList());
             Set<Long> musicSet = new HashSet<>(musicIds);
             if (musicSet.size() < musicIds.size()) {
-                throw new BizException("不予许添加相同的曲目");
+                throw new BizException("不能添加相同的曲目");
             }
         }
 

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

@@ -9,7 +9,6 @@
          t.id_ AS id
         , t.tenant_id_ AS tenantId
         , t.user_id_ AS userId
-        , t.avatar_ AS avatar
         , t.nickname_ AS nickname
         , t.im_token_ AS imToken
         , t.wechat_id_ AS wechatId
@@ -31,19 +30,24 @@
     <select id="selectPage" resultType="com.yonge.cooleshow.biz.dal.entity.TenantStaff">
 		SELECT         
         	<include refid="baseColumns" />
+        ,su.avatar_ as avatar
 		FROM tenant_staff t
+        left join sys_user su on t.user_id_ = su.id_
 	</select>
 
     <select id="getByPhone" resultType="com.yonge.cooleshow.biz.dal.entity.TenantStaff">
         select
             <include refid="baseColumns" />
+        ,t1.avatar_ as avatar
         from tenant_staff t
         left join sys_user t1 on t1.id_ = t.user_id_
         where t1.phone_ = #{phone}
     </select>
     <select id="selectByUserId" resultType="com.yonge.cooleshow.biz.dal.entity.TenantStaff">
         select <include refid="baseColumns" />
+        ,su.avatar_ as avatar
         from  tenant_staff t
+        left join sys_user su on t.user_id_ = su.id_
         where user_id_ = #{id}
     </select>
 </mapper>

cooleshow-user/user-tenant/src/main/java/com/yonge/cooleshow/tenant/controller/open/OpenTenantController.java

@@ -74,12 +74,13 @@ public class OpenTenantController {
         // 根据手机号 判断是否已经有机构账户
         TenantStaff tenantStaff = tenantStaffService.getByPhone(phone);
         if (tenantStaff != null) {
-            return HttpResponseResult.status(true);
+            return HttpResponseResult.succeed(true);
         }
-        return HttpResponseResult.status(false);
+        return HttpResponseResult.succeed(false);
     }
 
 
+
     @GetMapping("/bindWechat")
     @ApiOperation(value = "绑定微信")
     public HttpResponseResult<Boolean> bindWechat(@RequestParam("phone") String phone,