From ffe9c08011d25c39880d107a5f3de249d309c1b4 Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期一, 13 十一月 2023 12:37:56 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/mdc_430 into develop
---
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
index 8b4c619..44c0bc0 100644
--- a/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
+++ b/lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/OperationCertificateController.java
@@ -131,7 +131,10 @@
currentDate = c.getTime();
OperationCertificate operationCertificate = new OperationCertificate();
operationCertificate.setNum(identityService.getNumByTypeAndLength("OperationCertificate", 4));
- operationCertificate.setUserId(operationCertificateApplyDetail.getUserId());
+ SysUser sysUser = userService.getById(operationCertificateApplyDetail.getUserId());
+ if(sysUser != null){
+ operationCertificate.setUserId(sysUser.getUsername());
+ }
operationCertificate.setEquipmentIds(operationCertificateApplyDetail.getEquipmentIds());
operationCertificate.setCurrentCycleScore(12);
operationCertificate.setIssueDate(new Date());
--
Gitblit v1.9.3