|
@@ -53,7 +53,7 @@
|
|
|
<if test="serviceId != null and serviceId != ''">
|
|
<if test="serviceId != null and serviceId != ''">
|
|
|
and s.service_id= #{serviceId}
|
|
and s.service_id= #{serviceId}
|
|
|
</if>
|
|
</if>
|
|
|
-
|
|
|
|
|
|
|
+ and r.region_name is not null and su.NAME is not null
|
|
|
</where>
|
|
</where>
|
|
|
</select>
|
|
</select>
|
|
|
<select id="trend" resultType="java.util.Map">
|
|
<select id="trend" resultType="java.util.Map">
|
|
@@ -134,7 +134,7 @@
|
|
|
left join t_b_ding_apply d on d.sop_no=s.sop_no
|
|
left join t_b_ding_apply d on d.sop_no=s.sop_no
|
|
|
left join sys_user du on du.id=d.create_id
|
|
left join sys_user du on du.id=d.create_id
|
|
|
<where>
|
|
<where>
|
|
|
-
|
|
|
|
|
|
|
+ and r.region_name is not null and su.NAME is not null
|
|
|
<if test="serviceId != null and serviceId != ''">
|
|
<if test="serviceId != null and serviceId != ''">
|
|
|
and s.service_id= #{serviceId}
|
|
and s.service_id= #{serviceId}
|
|
|
</if>
|
|
</if>
|
shudonghui