|
@@ -139,7 +139,7 @@
|
|
|
AND ri.specification_ = #{specification}
|
|
|
</if>
|
|
|
<if test="search!=null and search!=''">
|
|
|
- AND (ria.mobile_no_ LIKE CONCAT('%', #{search}, '%') OR stu.username_ LIKE CONCAT('%', #{search}, '%'))
|
|
|
+ AND (ria.mobile_no_ LIKE CONCAT('%', #{search}, '%') OR ria.user_name_ LIKE CONCAT('%', #{search}, '%'))
|
|
|
</if>
|
|
|
</where>
|
|
|
</sql>
|
|
@@ -150,12 +150,12 @@
|
|
|
sub.name_ subject_name_,
|
|
|
ria.user_name_,
|
|
|
ria.mobile_no_,
|
|
|
+ ria.pay_status_,
|
|
|
ri.brand_,
|
|
|
ri.specification_
|
|
|
FROM
|
|
|
replacement_instrument_activity ria
|
|
|
LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
|
|
|
- LEFT JOIN sys_user stu ON ria.user_id_ = stu.id_
|
|
|
LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
|
|
|
<include refid="queryReplacementsCondition"/>
|
|
|
ORDER BY ria.update_time_ DESC
|
|
@@ -168,7 +168,6 @@
|
|
|
FROM
|
|
|
replacement_instrument_activity ria
|
|
|
LEFT JOIN replacement_instrument ri ON ria.instruments_id_ = ri.id_
|
|
|
- LEFT JOIN sys_user stu ON ria.user_id_ = stu.id_
|
|
|
LEFT JOIN `subject` sub ON ria.subject_id_ = sub.id_
|
|
|
<include refid="queryReplacementsCondition"/>
|
|
|
</select>
|