1.后台老师接口参数调整

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

@@ -66,6 +66,9 @@ public class TeacherSearch extends QueryInfo{
 	@ApiModelProperty("机构ID")
 	private Long tenantId;
 
+	@ApiModelProperty("机构名称")
+	private String tenantName;
+
 	@ApiModelProperty("结算方式")
 	private ESettlementFrom settlementFrom;
 

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

@@ -172,19 +172,19 @@
             <if test="param.evaluateFlag != null">
                 AND t.evaluate_time_ > 0
             </if>
-            <if test="param.tenantId ! =null">
-                AND t.tenantId_ = #{param.tenantId}
+            <if test="param.tenantId != null">
+                AND t.tenant_id_ = #{param.tenantId}
             </if>
-            <if test="param.settlementFrom ! =null">
+            <if test="param.settlementFrom != null">
                 AND t.settlement_from_ = #{param.settlementFrom}
             </if>
             <if test="param.tenantName != null and param.tenantName.trim() != ''">
-                and te.name_ like concat('%',#{param.tenantName},'%')
+                and ti.name_ like concat('%',#{param.tenantName},'%')
             </if>
         </where>
         <choose>
             <when test="param.orderBy != null and param.orderBy.trim() != ''">
-                order by #{param.orderBy}
+                order by ${param.orderBy}
             </when>
             <otherwise>
                 order by t.create_time_ desc

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

@@ -83,7 +83,7 @@ public class TeacherController extends BaseController {
         TenantInfo tenantInfo = getTenantInfo();
         query.setTenantId(tenantInfo.getId());
         query.setDelFlag(YesOrNoEnum.NO);
-        query.setOrderBy("t.username desc");
+        query.setOrderBy("u.username_ asc");
 
         IPage<TeacherVo> pages = teacherService.selectPage(PageUtil.getPage(query), query);
         List<TeacherVo> rows = pages.getRecords();