Merge pull request '组织架构图BUG修复' (#222) from feature/dxf into develop
Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/222
This commit is contained in:
commit
9e2c49d53b
|
|
@ -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 and (b.forbidden_tag is null or b.forbidden_tag = 0) 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.delete_type is null or b.delete_type = 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…
Reference in New Issue