|
|
@@ -576,7 +576,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
AND hd.`cabinet_id` = #{cabinetId}
|
|
|
</if>
|
|
|
<if test="applyUserId != null ">
|
|
|
- AND ah.`user_id` = #{applyUserId}
|
|
|
+ AND cjc.`user_id` = #{applyUserId}
|
|
|
</if>
|
|
|
</where>
|
|
|
GROUP BY hd.`chemical_id`
|
|
|
@@ -667,7 +667,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="applyUserId != null ">
|
|
|
- AND ah.`user_id` = #{applyUserId}
|
|
|
+ AND cjc.`user_id` = #{applyUserId}
|
|
|
</if>
|
|
|
</where>
|
|
|
GROUP BY cjc.`cabinet_id`
|
|
|
@@ -721,7 +721,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|
|
</foreach>
|
|
|
</if>
|
|
|
<if test="applyUserId != null ">
|
|
|
- AND ah.`user_id` = #{applyUserId}
|
|
|
+ AND cjc.`user_id` = #{applyUserId}
|
|
|
</if>
|
|
|
GROUP BY cjc.`chemical_id`,cjc.`cabinet_id`
|
|
|
)x2 ON x1.chemical_id = x2.chemical_id AND x1.cabinet_id = x2.cabinet_id
|