he2802 4 سال پیش
والد
کامیت
4736906edc

+ 2 - 0
zhongzheng-system/src/main/java/com/zhongzheng/modules/user/bo/UserQueryBo.java

@@ -100,5 +100,7 @@ public class UserQueryBo extends BaseEntity {
 	/** 状态 1正常 0关闭 */
 	@ApiModelProperty("状态 1正常 0关闭")
 	private List<Integer> status;
+	@ApiModelProperty("学校名称")
+	private String schoolName;
 
 }

+ 4 - 0
zhongzheng-system/src/main/resources/mapper/modules/user/UserMapper.xml

@@ -141,6 +141,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         `user` u
         LEFT JOIN ( SELECT opu.user_id, COUNT(*) num FROM order_possess_user opu WHERE opu.type_id = 1 GROUP BY opu.user_id ) temp ON u.user_id = temp.user_id
         LEFT JOIN ( SELECT usr.user_id, sum( usr.study_duration ) study_time FROM user_study_record usr GROUP BY usr.user_id ) temp1 ON u.user_id = temp1.user_id
+        LEFT JOIN user_school_info usi on u.user_id = usi.user_id
         WHERE
         1 = 1
         <if test="status != null and status.size()!=0 ">
@@ -158,6 +159,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         <if test="idCard != null and idCard != ''" >
             AND u.id_card = #{idCard}
         </if>
+        <if test="schoolName != null and schoolName != ''" >
+            AND usi.school_name = #{schoolName}
+        </if>
     </select>