Merge remote-tracking branch 'origin/develop' into feature/ml

src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml

@@ -249,14 +249,14 @@
         (id,ftype,fobjid,uuid,fclass,fclassname,fnumber,fname,fleader,fleaderimg,
          fleadername,fleaderjobid,fleaderjob,fleaderlv,fleaderst,fparentid,fobjparentid,
          fplan,fonjob,fisvitual,fdatebegin,fdateend)
-        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,to_number(b.BMFZR),c.messagerurl,
+        select a.id+100000000,2,a.id,a.uuid,0,'行政维度',a.DEPARTMENTCODE,a.departmentname,to_char(b.BMFZR),c.messagerurl,
                c.lastname,c.jobtitle,d.jobtitlemark,f.level_name,g.grade_name,
                (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid+100000000 end),
                (case nvl(a.supdepid,0) when 0 then a.subcompanyid1 else a.supdepid end),
                0,0,0,TO_DATE(to_char(SYSDATE,'yyyy-MM-dd'),'yyyy-MM-dd'), TO_DATE('2099-12-31','yyyy-MM-dd')
         from  HrmDepartment a
         left join hrmdepartmentdefined b on a.id=b.deptid
-        left join hrmresource c on to_char(b.BMFZR)=c.ID
+        left join hrmresource c on to_char(b.BMFZR)=to_char(c.ID)
         left join hrmjobtitles d on c.JOBTITLE=d.id
         left join cus_fielddata e on c.id = e.id and e.scope='HrmCustomFieldByInfoType' and e.scopeid=3
         left join jcl_org_level f on e.${level}=f.id

src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java

@@ -122,6 +122,9 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu
 
 
         List<HrmFamilyInfoPO> hrmFamilyInfoByUser = getHrmResourceMapper().getHrmFamilyInfoByUser(uId);
+        if (CollectionUtils.isEmpty(hrmFamilyInfoByUser)) {
+            hrmFamilyInfoByUser.add(new HrmFamilyInfoPO());
+        }
         List<List<PersonnelResumeColumn>> objects = new ArrayList<>();
         for (HrmFamilyInfoPO hrmFamilyInfoPO : hrmFamilyInfoByUser) {
             List<PersonnelResumeColumn> familyInfoDatas = new ArrayList<>();