From 81162852a279afd7d309a825f0b18e47a0c0084d Mon Sep 17 00:00:00 2001
From: lcj <2331845269@qq.com>
Date: Wed, 3 Sep 2025 10:24:09 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E4=BA=BA=E5=91=98=E5=AE=9E?=
 =?UTF-8?q?=E5=90=8D=E8=AE=A4=E8=AF=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../SubConstructionUserAuthenticationReq.java               | 6 ++++++
 .../service/impl/SubConstructionUserServiceImpl.java        | 2 +-
 .../dromara/job/cycle/IncSyncYs7DeviceCapturePicData.java   | 2 +-
 .../materials/service/impl/MatMaterialIssueServiceImpl.java | 3 ---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAuthenticationReq.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAuthenticationReq.java
index dfe9e9ff..dfb0cdf9 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAuthenticationReq.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/domain/dto/constructionuser/SubConstructionUserAuthenticationReq.java
@@ -16,6 +16,12 @@ public class SubConstructionUserAuthenticationReq implements Serializable {
     @Serial
     private static final long serialVersionUID = 1001024234468070802L;
 
+    /**
+     * 人脸照
+     */
+    @NotBlank(message = "人脸照不能为空")
+    private String facePic;
+
     /**
      * 人员姓名
      */
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
index 8e0e0402..5c429d5a 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/contractor/service/impl/SubConstructionUserServiceImpl.java
@@ -1143,7 +1143,7 @@ public class SubConstructionUserServiceImpl extends ServiceImpl<SubConstructionU
         HumanFaceReq request = new HumanFaceReq();
         request.setImage(reqBase64);
         Long userId = LoginHelper.getUserId();
-        SubConstructionUser constructionUser = this.getById(userId);
+        SubConstructionUser constructionUser = this.getBySysUserId(userId);
         if (constructionUser == null || StringUtils.isBlank(constructionUser.getFacePic())) {
             throw new ServiceException("未进行实名认证");
         }
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/cycle/IncSyncYs7DeviceCapturePicData.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/cycle/IncSyncYs7DeviceCapturePicData.java
index 86abbb0d..46d54ef9 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/cycle/IncSyncYs7DeviceCapturePicData.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/job/cycle/IncSyncYs7DeviceCapturePicData.java
@@ -26,7 +26,7 @@ import java.util.stream.Collectors;
  * @date 2025/6/18 15:59
  */
 @Slf4j
-@Component
+//@Component
 public class IncSyncYs7DeviceCapturePicData {
 
     @Resource
diff --git a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java
index afc65580..9149d06a 100644
--- a/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java
+++ b/xinnengyuan/ruoyi-modules/ruoyi-system/src/main/java/org/dromara/materials/service/impl/MatMaterialIssueServiceImpl.java
@@ -23,7 +23,6 @@ import org.dromara.common.mybatis.core.page.TableDataInfo;
 import org.dromara.common.oss.core.OssClient;
 import org.dromara.common.oss.exception.OssException;
 import org.dromara.common.oss.factory.OssFactory;
-import org.dromara.common.satoken.utils.LoginHelper;
 import org.dromara.common.utils.DocumentUtil;
 import org.dromara.materials.constants.MatMaterialsConstant;
 import org.dromara.materials.domain.MatMaterialIssue;
@@ -258,8 +257,6 @@ public class MatMaterialIssueServiceImpl extends ServiceImpl<MatMaterialIssueMap
                 BeanUtils.copyProperties(item, materialIssueItem);
                 materialIssueItem.setIssueId(materialIssue.getId());
                 materialIssueItem.setProjectId(materialIssue.getProjectId());
-                // 截取名称
-                materialIssueItem.setName(item.getName().split("_")[0]);
                 return materialIssueItem;
             }).toList();
             boolean result = materialIssueItemService.saveBatch(materialIssueItemList);