Merge branch 'feature/1019-tenant' into develop-new

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

@@ -307,8 +307,10 @@ public class TenantGroupServiceImpl extends ServiceImpl<TenantGroupMapper, Tenan
     @Override
     public List<TenantGroupWrapper.TenantGroupMember> queryGroupMember(Long tenantId, Long tenantGroupId) {
         StudentSearch studentSearch = new StudentSearch();
-        studentSearch.setRows(1);
-        studentSearch.setPage(9999);
+        studentSearch.setTenantId(tenantId);
+        studentSearch.setTenantGroupId(tenantGroupId);
+        studentSearch.setRows(9999);
+        studentSearch.setPage(1);
         List<StudentVo> studentVos = studentDao.selectPage(PageUtil.getPage(studentSearch), studentSearch);
         if (studentVos.isEmpty()) {
             return new ArrayList<>();

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

@@ -358,7 +358,7 @@
         select ifnull(tenant_group_id_,-1) tenantGroupId, count(user_id_) count
         from student
         <where>
-            lock_flag_ = 0
+            t.hide_flag_ = 0
             <if test="tenantId != null">
                 AND tenant_id_ =#{tenantId}
             </if>