|
@@ -281,7 +281,7 @@
|
|
|
|
|
|
<select id="selectRecordList" parameterType="TStaffmgr" resultMap="TStaffmgrResult">
|
|
|
<include refid="selectTStaffmgrVo"/>
|
|
|
- LEFT JOIN SYS_DICT_DATA s on d.ACTUALPOST = s.DICT_VALUE and s.DICT_TYPE = 'ACTUALPOST'
|
|
|
+ LEFT JOIN SYS_DICT_DATA s1 on d.ACTUALPOST = s1.DICT_VALUE and s1.DICT_TYPE = 'ACTUALPOST'
|
|
|
<where>
|
|
|
<if test="deptId != null and deptId != ''"> and d.dept_id = #{deptId} </if>
|
|
|
<if test="units != null and units != ''">
|
|
@@ -304,7 +304,7 @@
|
|
|
</where>
|
|
|
<!-- 数据范围过滤 -->
|
|
|
${params.dataScope}
|
|
|
- ORDER BY s.DICT_SORT, d.id
|
|
|
+ ORDER BY s1.DICT_SORT, d.id
|
|
|
</select>
|
|
|
|
|
|
<select id="selectList" parameterType="TStaffmgr" resultMap="TStaffmgrResult">
|
|
@@ -749,25 +749,25 @@
|
|
|
|
|
|
<select id="selectTMentorStaffmgrByPost" resultMap="TStaffmgrResult">
|
|
|
<include refid="selectTStaffmgrVo"/>
|
|
|
- LEFT JOIN SYS_DICT_DATA s on d.ACTUALPOST = s.DICT_VALUE and s.DICT_TYPE = 'ACTUALPOST'
|
|
|
+ LEFT JOIN SYS_DICT_DATA s1 on d.ACTUALPOST = s1.DICT_VALUE and s1.DICT_TYPE = 'ACTUALPOST'
|
|
|
where
|
|
|
d.dept_id = #{deptId}
|
|
|
and d.del_flag = 0
|
|
|
- and (s.DICT_LABEL like '%主管%'
|
|
|
- or s.DICT_LABEL like '%经理%'
|
|
|
- or s.DICT_LABEL like '%工程师%'
|
|
|
+ and (s1.DICT_LABEL like '%主管%'
|
|
|
+ or s1.DICT_LABEL like '%经理%'
|
|
|
+ or s1.DICT_LABEL like '%工程师%'
|
|
|
)
|
|
|
</select>
|
|
|
|
|
|
<select id="selectTStaffmgrByPost" resultMap="TStaffmgrResult">
|
|
|
<include refid="selectTStaffmgrVo"/>
|
|
|
- LEFT JOIN SYS_DICT_DATA s on d.ACTUALPOST = s.DICT_VALUE and s.DICT_TYPE = 'ACTUALPOST'
|
|
|
+ LEFT JOIN SYS_DICT_DATA s1 on d.ACTUALPOST = s1.DICT_VALUE and s1.DICT_TYPE = 'ACTUALPOST'
|
|
|
where
|
|
|
d.dept_id = #{deptId}
|
|
|
and d.del_flag = 0
|
|
|
- and (s.DICT_LABEL like '%主操%'
|
|
|
- or s.DICT_LABEL like '%班长%'
|
|
|
- or s.DICT_LABEL like '%工长%'
|
|
|
+ and (s1.DICT_LABEL like '%主操%'
|
|
|
+ or s1.DICT_LABEL like '%班长%'
|
|
|
+ or s1.DICT_LABEL like '%工长%'
|
|
|
)
|
|
|
</select>
|
|
|
</mapper>
|