|
@@ -151,8 +151,9 @@
|
|
|
</select>
|
|
|
|
|
|
<select id="queryPage" resultMap="StudentRepair">
|
|
|
- SELECT sr.*,o.name_ FROM student_repair sr
|
|
|
+ SELECT sr.*,o.name_,su.username_ student_name_ FROM student_repair sr
|
|
|
LEFT JOIN organization o ON o.id_ = sr.organ_id_
|
|
|
+ LEFT JOIN sys_user su on sr.student_id_ = su.id_
|
|
|
<include refid="queryPageSql"/>
|
|
|
ORDER BY id_ DESC
|
|
|
<include refid="global.limit"/>
|
|
@@ -160,7 +161,7 @@
|
|
|
<sql id="queryPageSql">
|
|
|
<where>
|
|
|
<if test="search != null and search != ''">
|
|
|
- AND (sr.trans_no_ LIKE CONCAT('%',#{search},'%') OR sr.student_id_ = #{search} OR sr.student_name_ LIKE
|
|
|
+ AND (sr.trans_no_ LIKE CONCAT('%',#{search},'%') OR sr.student_id_ = #{search} OR su.username_ LIKE
|
|
|
CONCAT('%',#{search},'%'))
|
|
|
</if>
|
|
|
<if test="employeeId != null">
|
|
@@ -194,6 +195,7 @@
|
|
|
</sql>
|
|
|
<select id="queryCount" resultType="int">
|
|
|
SELECT COUNT(id_) FROM student_repair sr
|
|
|
+ LEFT JOIN sys_user su on sr.student_id_ = su.id_
|
|
|
<include refid="queryPageSql"/>
|
|
|
</select>
|
|
|
|