组织架构图BUG修复 #221

Merged
dxfeng merged 2 commits from feature/dxf into develop 2 years ago

@ -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

@ -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;
}

Loading…
Cancel
Save