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

cooleshow-auth/auth-server/src/main/java/com/yonge/cooleshow/auth/service/impl/SysUserServiceImpl.java

@@ -434,13 +434,14 @@ public class SysUserServiceImpl extends BaseServiceImpl<Long, SysUser> implement
     @Transactional(rollbackFor = Exception.class)
     public HttpResponseResult<List<String>> logoffByPhone(String phone) {
 
-        HttpResponseResult<List<String>> check = adminFeignService.accountLogoffCheck(phone);
-        if (check.getCode() != 200) {
+        try {
+            HttpResponseResult<List<String>> check = adminFeignService.accountLogoffCheck(phone);
             List<String> errMsg = check.getData();
-            if (org.apache.commons.collections.CollectionUtils.isNotEmpty(errMsg)) {
+            if (!CollectionUtils.isEmpty(errMsg)) {
                 return HttpResponseResult.failed(500, errMsg, "注销失败");
             }
-            return HttpResponseResult.failed("");
+        } catch (Exception e) {
+            throw new BizException("数据检查失败");
         }
 
         int num = sysUserDao.countByPhone(phone);

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

@@ -271,7 +271,7 @@ public class SysUserServiceImpl implements SysUserService {
                     .eq(ImGroupMember::getGroupRoleType, EImGroupMemberRoleType.Owner)
                     .list();
             List<String> groupIdList = groupMembers.stream().map(ImGroupMember::getGroupId).collect(Collectors.toList());
-            if (groupIdList.isEmpty()) {
+            if (!groupIdList.isEmpty()) {
                 Collection<ImGroup> imGroups = imGroupService.listByIds(groupIdList);
                 long orgGroups = imGroups.stream().filter(next -> ImGroupType.ORG.equals(next.getType())).count();
                 if (orgGroups > 0) {