From a43269610572dfaaa48dfcfd4dacde4f5febacae Mon Sep 17 00:00:00 2001
From: pengjie <17373303529@163.com>
Date: Tue, 5 Dec 2023 17:47:48 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/com/zhgd/xmgl/async/AsyncEmail.java               | 2 +-
 .../basicdata/controller/admin/GovernmentConfigController.java  | 2 +-
 .../zhgd/xmgl/modules/basicdata/entity/GovernmentConfig.java    | 2 +-
 .../basicdata/service/impl/EngineeringSingleServiceImpl.java    | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/main/java/com/zhgd/xmgl/async/AsyncEmail.java b/src/main/java/com/zhgd/xmgl/async/AsyncEmail.java
index eb940d2..dcdd05d 100644
--- a/src/main/java/com/zhgd/xmgl/async/AsyncEmail.java
+++ b/src/main/java/com/zhgd/xmgl/async/AsyncEmail.java
@@ -27,7 +27,7 @@ public class AsyncEmail {
     @Async("taskExecutor")
     public void sendEmail(String sn, String receiveUser, String title, String content) {
         GovernmentConfig governmentConfig = governmentConfigService.getOne(Wrappers.<GovernmentConfig>lambdaQuery().eq(GovernmentConfig::getGovernmentSn, sn)
-                .eq(GovernmentConfig::getKey, ParamEnum.GovernmentConfig.EMAIL.getValue()));
+                .eq(GovernmentConfig::getConfigKey, ParamEnum.GovernmentConfig.EMAIL.getValue()));
         if (governmentConfig != null && StringUtils.isNotBlank(governmentConfig.getValue())) {
             EmailsUtil.send(governmentConfig.getValue(), receiveUser, title, content);
         }
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentConfigController.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentConfigController.java
index 5dbf15a..de1aad9 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentConfigController.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/controller/admin/GovernmentConfigController.java
@@ -35,7 +35,7 @@ import java.util.Map;
  * @version： V1.0
  */
 @RestController
-@RequestMapping("/basicdata/governmentConfig")
+@RequestMapping("/xmgl/governmentConfig")
 @Slf4j
 @Api(tags = "政务配置管理")
 public class GovernmentConfigController {
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/GovernmentConfig.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/GovernmentConfig.java
index c3c3042..af0759d 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/GovernmentConfig.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/entity/GovernmentConfig.java
@@ -39,7 +39,7 @@ public class GovernmentConfig implements Serializable {
      */
     @Excel(name = "配置键名", width = 15)
     @ApiModelProperty(value = "配置键名")
-    private String key;
+    private String configKey;
     /**
      * 配置值
      */
diff --git a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java
index 1bae967..9c5c0aa 100644
--- a/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java
+++ b/src/main/java/com/zhgd/xmgl/modules/basicdata/service/impl/EngineeringSingleServiceImpl.java
@@ -83,7 +83,7 @@ public class EngineeringSingleServiceImpl extends ServiceImpl<EngineeringSingleM
         this.remove(Wrappers.<EngineeringSingle>lambdaQuery()
                 .eq(EngineeringSingle::getEngineeringSn, engineeringSn));
         annexFileService.remove(Wrappers.<AnnexFile>lambdaQuery()
-                .eq(AnnexFile::getRelevanceId, engineeringSn).eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.ENGINEERING));
+                .eq(AnnexFile::getRelevanceId, engineeringSn).eq(AnnexFile::getFileType, ParamEnum.AnnexFileType.ENGINEERING.getValue()));
         List<EngineeringMain> engineeringMains = engineeringMainService.list(Wrappers.<EngineeringMain>lambdaQuery()
                 .eq(EngineeringMain::getEngineeringSn, engineeringSn));
         List<Long> mainIds = engineeringMains.stream().map(m -> m.getId()).collect(Collectors.toList());