|
@@ -855,6 +855,9 @@
|
|
|
<if test="projectId != null and projectId != ''">
|
|
<if test="projectId != null and projectId != ''">
|
|
|
AND g.project_id = #{projectId}
|
|
AND g.project_id = #{projectId}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="majorId != null and majorId != ''">
|
|
|
|
|
+ AND g.major_id = #{majorId}
|
|
|
|
|
+ </if>
|
|
|
<if test="educationTypeId != null and educationTypeId != ''">
|
|
<if test="educationTypeId != null and educationTypeId != ''">
|
|
|
AND g.education_type_id = #{educationTypeId}
|
|
AND g.education_type_id = #{educationTypeId}
|
|
|
</if>
|
|
</if>
|
|
@@ -969,6 +972,9 @@
|
|
|
<if test="educationTypeId != null and educationTypeId != ''">
|
|
<if test="educationTypeId != null and educationTypeId != ''">
|
|
|
AND g.education_type_id = #{educationTypeId}
|
|
AND g.education_type_id = #{educationTypeId}
|
|
|
</if>
|
|
</if>
|
|
|
|
|
+ <if test="majorId != null and majorId != ''">
|
|
|
|
|
+ AND g.major_id = #{majorId}
|
|
|
|
|
+ </if>
|
|
|
<if test="goodsName != null and goodsName != '' ">
|
|
<if test="goodsName != null and goodsName != '' ">
|
|
|
and g.goods_name like concat('%', #{goodsName}, '%')
|
|
and g.goods_name like concat('%', #{goodsName}, '%')
|
|
|
</if>
|
|
</if>
|