From 2b00d7f2edfd0cad08358dfe4172f6d0ff39ca5b Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 30 Apr 2024 20:36:28 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=BB=E7=AE=A1?=
=?UTF-8?q?=E8=AF=95=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../basicdata/service/impl/FlowOrgRepositoryServiceImpl.java | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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 a6f35a502..59afbcb12 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("");
+ deptDo.setLeader(xzProjectOrg.getLeader().toString());
deptDo.setParentId(xzProjectOrg.getParentId().toString());
return deptDo;
}
From f6522597a02dc9ca18b4171f0d49d7ea83241448 Mon Sep 17 00:00:00 2001
From: guoshengxiong <1923636941@qq.com>
Date: Tue, 30 Apr 2024 23:40:50 +0800
Subject: [PATCH 2/3] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../modules/basicdata/controller/SystemUserController.java | 2 +-
.../xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
index f3d1a69db..64c734958 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/SystemUserController.java
@@ -148,7 +148,7 @@ public class SystemUserController {
return Result.success(systemUserService.getSystemUserBySn(map));
}
- @ApiOperation(value = "根据企业或项目SN查找账号分页列表", notes = "根据企业或项目SN查找账号分页列表", httpMethod = "POST")
+ @ApiOperation(value = "根据企业或项目SN查找账号分页列表", notes = "根据企业或项目SN查找账号分页列表1", httpMethod = "POST")
@ApiImplicitParams({
@ApiImplicitParam(name = "sn", required = true, value = "企业或项目SN", paramType = "body"),
@ApiImplicitParam(name = "pageNo", value = "第几页", paramType = "query", required = true, dataType = "Integer"),
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
index a78072fb5..3ccd2e8c6 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/mapper/xml/SystemUserMapper.xml
@@ -18,7 +18,7 @@
LEFT JOIN xz_project_org po on po.id=a.xz_project_org_id
LEFT JOIN enterprise_info ei on ei.id=d.enterprise_id
LEFT JOIN project_enterprise pe on pe.enterprise_id=ei.id and pe.project_sn=a.sn
- left join xz_project_org po on po.id=a.xz_project_org_id
+ left join xz_project_org xpo on xpo.id=a.xz_project_org_id
WHERE a.sn = #{projectSn}
and a.account_type = 6
@@ -37,7 +37,7 @@
and pe.enterprise_type_id = #{enterpriseTypeId}
- and po.id = #{xzProjectOrgId}
+ and xpo.id = #{xzProjectOrgId}
and a.user_id = #{userId}
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 3/3] =?UTF-8?q?=E9=83=A8=E9=97=A8=E4=B8=BB=E7=AE=A1?=
=?UTF-8?q?=E4=BF=AE=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
+
+