diff --git a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java index aa6869e7..0e6482cc 100644 --- a/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java +++ b/src/com/engine/organization/entity/hrmresource/vo/HrmResourceVO.java @@ -26,7 +26,13 @@ import lombok.NoArgsConstructor; "t.telephone," + "t.managerid, " + "t.dsporder ", - fromSql = "FROM hrmresource t left join cus_fielddata t0 on t.id = t0.id and t0.scopeid ='-1' left join cus_fielddata t1 on t.id = t1.id and t1.scopeid ='1' left join cus_fielddata t2 on t.id = t2.id and t2.scopeid ='3' left join HRMJOBTITLES t3 on t.JOBTITLE=t3.id left join HRMJOBACTIVITIES t4 on t3.JOBACTIVITYID=t4.ID left join HRMJOBGROUPS t5 on t4.JOBGROUPID=t5.ID ", + fromSql = "FROM hrmresource t" + + " left join cus_fielddata t0 on t.id = t0.id and t0.scopeid ='-1' and t0.scope = 'HrmCustomFieldByInfoType'" + + " left join cus_fielddata t1 on t.id = t1.id and t1.scopeid ='1' and t1.scope = 'HrmCustomFieldByInfoType'" + + " left join cus_fielddata t2 on t.id = t2.id and t2.scopeid ='3' and t2.scope = 'HrmCustomFieldByInfoType'" + + " left join HRMJOBTITLES t3 on t.JOBTITLE=t3.id" + + " left join HRMJOBACTIVITIES t4 on t3.JOBACTIVITYID=t4.ID" + + " left join HRMJOBGROUPS t5 on t4.JOBGROUPID=t5.ID ", orderby = " t.dsporder ", sortway = " asc", primarykey = "id",