From 670afcacfd3e74f93943e41d621b8732088e2710 Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Mon, 13 Nov 2023 17:54:14 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=908.0.3=E3=80=91=E3=80=90system=E3=80=91?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E7=94=A8=E6=88=B7=E8=AF=A6=E6=83=85=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=E4=BF=A1=E6=81=AF=E7=9A=84=E6=B8=B2=E6=9F=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../user/pojo/response/SysUserCertificateResponse.java    | 8 ++++++++
 .../user/service/impl/SysUserCertificateServiceImpl.java  | 2 +-
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/response/SysUserCertificateResponse.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/response/SysUserCertificateResponse.java
index 767737ad7..af6404e37 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/response/SysUserCertificateResponse.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/pojo/response/SysUserCertificateResponse.java
@@ -1,6 +1,7 @@
 package cn.stylefeng.roses.kernel.sys.modular.user.pojo.response;
 
 import cn.stylefeng.roses.kernel.dict.api.format.DictFormatProcess;
+import cn.stylefeng.roses.kernel.file.api.format.FileInfoFormatProcess;
 import cn.stylefeng.roses.kernel.rule.annotation.ChineseDescription;
 import cn.stylefeng.roses.kernel.rule.annotation.SimpleFieldFormat;
 import lombok.Data;
@@ -47,4 +48,11 @@ public class SysUserCertificateResponse {
     @ChineseDescription("证书到期日期，如果为空，则为长期")
     private Date dateExpires;
 
+    /**
+     * 附件id
+     */
+    @ChineseDescription("附件id")
+    @SimpleFieldFormat(processClass = FileInfoFormatProcess.class)
+    private Long attachmentId;
+
 }
diff --git a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserCertificateServiceImpl.java b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserCertificateServiceImpl.java
index b6e9abb16..8193af863 100644
--- a/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserCertificateServiceImpl.java
+++ b/kernel-s-system/system-business-hr/src/main/java/cn/stylefeng/roses/kernel/sys/modular/user/service/impl/SysUserCertificateServiceImpl.java
@@ -58,7 +58,7 @@ public class SysUserCertificateServiceImpl extends ServiceImpl<SysUserCertificat
         queryWrapper.eq(SysUserCertificate::getUserId, userId);
 
         queryWrapper.select(SysUserCertificate::getCertificateType, SysUserCertificate::getCertificateNo, SysUserCertificate::getDateIssued,
-                SysUserCertificate::getDateExpires, SysUserCertificate::getIssuingAuthority);
+                SysUserCertificate::getDateExpires, SysUserCertificate::getIssuingAuthority, SysUserCertificate::getAttachmentId);
         List<SysUserCertificate> sysUserCertificateList = this.list(queryWrapper);
         if (ObjectUtil.isEmpty(sysUserCertificateList)) {
             return new ArrayList<>();