|
@@ -53,10 +53,10 @@
|
|
<where>
|
|
<where>
|
|
mi.status=1
|
|
mi.status=1
|
|
<if test="measurement.companyOrgId != null">
|
|
<if test="measurement.companyOrgId != null">
|
|
- and ms.company_org_id = #{measurement.companyOrgId}
|
|
|
|
|
|
+ and mi.company_org_id = #{measurement.companyOrgId}
|
|
</if>
|
|
</if>
|
|
<if test="measurement.deptOrgId != null">
|
|
<if test="measurement.deptOrgId != null">
|
|
- and ms.dept_org_id = #{measurement.deptOrgId}
|
|
|
|
|
|
+ and mi.dept_org_id = #{measurement.deptOrgId}
|
|
</if>
|
|
</if>
|
|
<if test="measurement.planName != null and measurement.planName != ''">
|
|
<if test="measurement.planName != null and measurement.planName != ''">
|
|
and ms.plan_name like concat('%',#{measurement.planName} ,'%')
|
|
and ms.plan_name like concat('%',#{measurement.planName} ,'%')
|