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

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 = -1L;
+    private Long tenantGroupId;
 
     @ApiModelProperty("机构名称")
     private String tenantName;

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

@@ -367,7 +367,9 @@ public class TenantActivationCodeServiceImpl extends ServiceImpl<TenantActivatio
             throw new BizException("无可撤回的激活码");
         }
 
-        this.sendCancel(tenantInfo, tenantActivationCodes.iterator().next());
+        for (TenantActivationCode code : tenantActivationCodes) {
+            this.sendCancel(tenantInfo, code);
+        }
     }
 
     @Transactional(rollbackFor = Exception.class)

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

@@ -21,13 +21,13 @@
         FROM tenant_group t
         <where>
             <if test="param.keyword != null and param.keyword.trim() !=''">
-                t.name_ like concat('%',#{param.keyword},'%')
+               AND t.name_ like concat('%',#{param.keyword},'%')
             </if>
             <if test="param.tenantId != null">
-                t.tenant_id_ = #{param.tenantId}
+                AND t.tenant_id_ = #{param.tenantId}
             </if>
             <if test="param.adminId != null">
-                t.admin_id_ = #{param.adminId}
+                AND t.admin_id_ = #{param.adminId}
             </if>
         </where>
         ORDER BY t.id_ ASC