From 130c4e4897664119c1ca3740cdb1244878839d4d Mon Sep 17 00:00:00 2001 From: pengjie <17373303529@163.com> Date: Wed, 1 May 2024 01:09:50 +0800 Subject: [PATCH] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=BB=E7=AE=A1=E4=BF=AE?= =?UTF-8?q?=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/FlowOrgRepositoryServiceImpl.java | 2 +- .../mapper/WorkerInfoAuditRecordMapper.java | 3 ++ .../xml/WorkerInfoAuditRecordMapper.xml | 47 ++++++++++++++++++ .../WorkerInfoAuditRecordServiceImpl.java | 2 +- .../lib/wflow-server-1.0-SNAPSHOT.jar | Bin 481673 -> 481739 bytes 5 files changed, 52 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java index 59afbcb12..b25812e4e 100644 --- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java +++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/FlowOrgRepositoryServiceImpl.java @@ -169,7 +169,7 @@ public class FlowOrgRepositoryServiceImpl implements OrgRepositoryService { DeptDo deptDo = new DeptDo(); deptDo.setId(xzProjectOrg.getId().toString()); deptDo.setDeptName(xzProjectOrg.getDeptName()); - deptDo.setLeader(xzProjectOrg.getLeader().toString()); + deptDo.setLeader(xzProjectOrg.getLeader() == null ? null : xzProjectOrg.getLeader().toString()); deptDo.setParentId(xzProjectOrg.getParentId().toString()); return deptDo; } diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java index bb4dc81f0..098d738df 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/WorkerInfoAuditRecordMapper.java @@ -24,6 +24,9 @@ public interface WorkerInfoAuditRecordMapper extends BaseMapper selectWorkerInfoAuditList(Page page, @Param("param")Map map); + @DataScope(includeTable = "worker_info_audit_record") + List selectWorkerInfoAuditList1(Page page, @Param("param")Map map); + @DataScope(includeTable = "worker_info_audit_record") EntityMap viewWorkerInfoDetail(Map map); diff --git a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml index 7fdf907f8..faa62fc64 100644 --- a/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml +++ b/src/main/java/com/zhgd/xmgl/modules/worker/mapper/xml/WorkerInfoAuditRecordMapper.xml @@ -45,6 +45,53 @@ order by a.id desc + +