From 395d93067aa6c667ddc35cee9ac8b4cf396c08ab Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 3 Jan 2023 10:01:19 +0800 Subject: [PATCH 1/2] =?UTF-8?q?Oracle,SQL=E8=84=9A=E6=9C=ACBUG=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml b/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml index d263ceda..ddb14133 100644 --- a/src/com/engine/organization/mapper/jclorgmap/JclOrgMapper.xml +++ b/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 From bccae91e75e019269811806b21d10bf49adeca58 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Tue, 3 Jan 2023 10:32:11 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E4=BA=BA=E5=91=98=E7=AE=80=E5=8E=86?= =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../organization/service/impl/PersonnelResumeServiceImpl.java | 3 +++ 1 file changed, 3 insertions(+) diff --git a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java index 3b26cf91..50e55f5a 100644 --- a/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java +++ b/src/com/engine/organization/service/impl/PersonnelResumeServiceImpl.java @@ -121,6 +121,9 @@ public class PersonnelResumeServiceImpl extends Service implements PersonnelResu List hrmFamilyInfoByUser = getHrmResourceMapper().getHrmFamilyInfoByUser(uId); + if (CollectionUtils.isEmpty(hrmFamilyInfoByUser)) { + hrmFamilyInfoByUser.add(new HrmFamilyInfoPO()); + } List> objects = new ArrayList<>(); for (HrmFamilyInfoPO hrmFamilyInfoPO : hrmFamilyInfoByUser) { List familyInfoDatas = new ArrayList<>();