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

cooleshow-user/user-biz/src/main/java/com/yonge/cooleshow/biz/dal/dto/search/StudentSearch.java

@@ -69,7 +69,7 @@ public class StudentSearch extends QueryInfo{
     private Long tenantId;
 
     @ApiModelProperty("机构小组ID")
-    private Long tenantGroupId;
+    private String tenantGroupId;
 
     @ApiModelProperty("机构名称")
     private String tenantName;

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

@@ -1071,7 +1071,7 @@ public class TeacherServiceImpl extends ServiceImpl<TeacherDao, Teacher> impleme
                     .eq(TenantGroup::getAdminId, teacher.getUserId());
             Integer count = tenantGroupMapper.selectCount(queryWrapper);
             if (count > 0) {
-                throw new BizException("该老师存在机构小组负责人身份，请先移交小组或者解散小组");
+                throw new BizException("该老师存在机构小组负责人身份，请先更换老师或者退出小组");
             }
 
             // 机构老师处理流程

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

@@ -312,7 +312,7 @@ public class TenantGroupServiceImpl extends ServiceImpl<TenantGroupMapper, Tenan
     public List<TenantGroupWrapper.TenantGroupMember> queryGroupMember(Long tenantId, Long tenantGroupId) {
         StudentSearch studentSearch = new StudentSearch();
         studentSearch.setTenantId(tenantId);
-        studentSearch.setTenantGroupId(tenantGroupId);
+        studentSearch.setTenantGroupId(tenantGroupId.toString());
         studentSearch.setRows(9999);
         studentSearch.setPage(1);
         List<StudentVo> studentVos = studentDao.selectPage(PageUtil.getPage(studentSearch), studentSearch);

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

@@ -224,7 +224,7 @@ public class TenantUnbindRecordServiceImpl extends ServiceImpl<TenantUnbindRecor
                 .eq(TenantGroup::getAdminId, teacher.getUserId());
         Integer count = tenantGroupMapper.selectCount(queryWrapper);
         if (count > 0) {
-            throw new BizException("该老师存在机构小组负责人身份，请先移交小组或者解散小组");
+            throw new BizException("该老师存在机构小组负责人身份，请先更换老师或者退出小组");
         }
 
         this.lambdaUpdate()

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

@@ -122,7 +122,7 @@
                 and u.gender_ = #{param.gender}
             </if>
             <if test="null != param.subjectId and '' != param.subjectId">
-                and INTE_ARRAY(t.subject_id_,#{param.subjectId})
+                AND FIND_IN_SET(t.subject_id_, #{param.subjectId})
             </if>
             <if test="null != param.isVip">
                 <if test="1 == param.isVip.code">
@@ -177,8 +177,8 @@
                     #{item}
                 </foreach>
             </if>
-            <if test="param.tenantGroupId != null">
-                and t.tenant_group_id_ = #{param.tenantGroupId}
+            <if test="param.tenantGroupId != null and param.tenantGroupId.trim() != ''">
+                AND FIND_IN_SET(t.tenant_group_id_, #{param.tenantGroupId})
             </if>
         </where>
         <choose>