liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request '组织架构图BUG修复' (#221) from feature/dxf into develop 

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/221
This commit is contained in:
dxfeng 2023-09-21 15:32:05 +08:00
parent d0925f3d1f dadef74b33
commit cfd781c4f8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/com/engine/organization/mapper/job/JobMapper.xml
View File

@ -510,6 +510,7 @@
from jcl_org_job t
inner join hrmresource h on t.ec_jobtitle = h.jobtitle and t.ec_company = h.subcompanyid1 and
t.ec_department = h.departmentid
where h.status < 4
</select>
<select id="isAllowDelete" resultType="java.lang.String">
select t.id

2
src/com/engine/organization/service/impl/ChartServiceImpl.java
View File

@ -274,7 +274,7 @@ public class ChartServiceImpl extends Service implements ChartService {
if (showJob) {
// 查询部门下的岗位
if (isRealTime) {
sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle where b.ec_department = '" + departmentId + "'";
sql = "select a.id,a.jobtitlename as name from hrmjobtitles a inner join jcl_org_job b on a.id = b.ec_jobtitle and (b.forbidden_tag is null or b.forbidden_tag = 0) where b.ec_department = '" + departmentId + "'";
} else {
sql = "select jobid as id ,jobname as name from jcl_chart_job where departmentid = '" + departmentId + "' and versionid = " + versionId;
}