Commit d0a6a58f61dca55da24999d146c85c1461610ee3
Merge branch 'branch0730' of http://192.168.1.195:9998/ZTEITS-Developers/zteits-…
…oa.git into branch0730
Showing
1 changed file
with
4 additions
and
4 deletions
src/main/resources/mybatis/smapper/AsraOpSmapper.xml
| @@ -36,16 +36,16 @@ | @@ -36,16 +36,16 @@ | ||
| 36 | ap.city_id cityId, | 36 | ap.city_id cityId, |
| 37 | ap.city_name cityName, | 37 | ap.city_name cityName, |
| 38 | ap.is_remind_email isRemindEmail | 38 | ap.is_remind_email isRemindEmail |
| 39 | - from asra_op ap,asra_op_relations apr | ||
| 40 | - where 1=1 and ap.id = apr.op_id | 39 | + from asra_op ap left join asra_op_relations apr on ap.id = apr.op_id |
| 40 | + where 1=1 | ||
| 41 | <if test="id != null "> | 41 | <if test="id != null "> |
| 42 | - and apr.parent_id = #{id} or ap.id = #{id} | 42 | + and (apr.parent_id = #{id} or ap.id = #{id}) |
| 43 | </if> | 43 | </if> |
| 44 | <if test="loginCode != null and loginCode !=''"> | 44 | <if test="loginCode != null and loginCode !=''"> |
| 45 | and ap.login_code = #{loginCode,jdbcType=VARCHAR} | 45 | and ap.login_code = #{loginCode,jdbcType=VARCHAR} |
| 46 | </if> | 46 | </if> |
| 47 | <if test="opName != null and opName != ''"> | 47 | <if test="opName != null and opName != ''"> |
| 48 | - and ap.op_name ike concat('${opName}','%') | 48 | + and ap.op_name like concat('%','${opName}','%') |
| 49 | </if> | 49 | </if> |
| 50 | <if test="email != null and email != ''"> | 50 | <if test="email != null and email != ''"> |
| 51 | and ap.email = #{email,jdbcType=VARCHAR} | 51 | and ap.email = #{email,jdbcType=VARCHAR} |