|
@@ -261,15 +261,15 @@
|
|
|
select a.*,b.plan_name from rmcp_measurement_instance a join rmcp_measurement_settlement b
|
|
|
on a.plan_id=b.id
|
|
|
<where>
|
|
|
- status=1
|
|
|
+ a. status=1
|
|
|
<if test="id !=null">
|
|
|
and plan_id=#{id}
|
|
|
</if>
|
|
|
<if test="companyId !=null">
|
|
|
- and company_org_id=#{companyId}
|
|
|
+ and b.company_org_id=#{companyId}
|
|
|
</if>
|
|
|
<if test="departId !=null">
|
|
|
- and dept_org_id=#{departId}
|
|
|
+ and b.dept_org_id=#{departId}
|
|
|
</if>
|
|
|
</where>
|
|
|
|