fix 81445 专项项目库-依据描述弹窗,缺少部门查询条件
This commit is contained in:
+6
@@ -197,4 +197,10 @@ public class ProcessProjectStandardTermUser {
|
|||||||
@TableField(exist = false)
|
@TableField(exist = false)
|
||||||
@ApiModelProperty(value="姓名")
|
@ApiModelProperty(value="姓名")
|
||||||
private String realName;
|
private String realName;
|
||||||
|
/**
|
||||||
|
* 部门id
|
||||||
|
*/
|
||||||
|
@TableField(exist = false)
|
||||||
|
@ApiModelProperty(value="部门id")
|
||||||
|
private String departId;
|
||||||
}
|
}
|
||||||
+7
-2
@@ -34,8 +34,10 @@
|
|||||||
</sql>
|
</sql>
|
||||||
|
|
||||||
<select id="selectPageByUser" resultMap="BaseResultMap">
|
<select id="selectPageByUser" resultMap="BaseResultMap">
|
||||||
select ppstu.* from process_project_standard_term_user ppstu left join
|
select ppstu.* from process_project_standard_term_user ppstu
|
||||||
sys_user su on ppstu.design_engineer = su.id
|
left join sys_user su on ppstu.design_engineer = su.id
|
||||||
|
left join sys_user_depart sud on su.id = sud.user_id
|
||||||
|
left join sys_depart sd on sud.user_id = sd.id
|
||||||
<where>
|
<where>
|
||||||
<if test="termUser.termId != null and termUser.termId != ''">
|
<if test="termUser.termId != null and termUser.termId != ''">
|
||||||
ppstu.term_id = #{termUser.termId}
|
ppstu.term_id = #{termUser.termId}
|
||||||
@@ -52,6 +54,9 @@
|
|||||||
<if test="termUser.realName != null and termUser.realName != ''">
|
<if test="termUser.realName != null and termUser.realName != ''">
|
||||||
and su.realname like concat('%', #{termUser.realName}, '%')
|
and su.realname like concat('%', #{termUser.realName}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
<if test="termUser.departId != null and termUser.departId != ''">
|
||||||
|
and FIND_IN_SET(#{termUser.departId} , su.depart_ids)
|
||||||
|
</if>
|
||||||
</where>
|
</where>
|
||||||
|
|
||||||
</select>
|
</select>
|
||||||
|
|||||||
Reference in New Issue
Block a user