From 0312c83823f99c6dedb543637d3b85043ad0ae7a Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Sun, 28 Sep 2025 17:52:21 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=B9=E9=87=8F=E4=B8=8A=E4=BC=A0=E9=99=84?=
 =?UTF-8?q?=E4=BB=B6=EF=BC=8C=E6=A0=A1=E9=AA=8C=E8=A7=84=E5=88=99=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=91=98=E5=B7=A5=E5=A7=93=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../seconddev/entry/controller/EntryManageController.java   | 4 ++--
 .../weaver/seconddev/entry/mapper/EntryManageMapper.java    | 2 ++
 .../weaver/seconddev/entry/service/EntryManageService.java  | 3 ++-
 .../entry/service/impl/EntryManageServiceImpl.java          | 4 ++--
 .../resources/mapper/entry/mapper/EntryManageMapper.xml     | 6 ++++++
 5 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java b/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java
index cd9bca7..f4a41af 100644
--- a/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java
+++ b/src/main/java/com/weaver/seconddev/entry/controller/EntryManageController.java
@@ -27,8 +27,8 @@ public class EntryManageController {
     HrComEstService hrComEstService;
 
     @GetMapping("/checkJobNum")
-    public WeaResult<Map<String, Object>> checkJobNum(@RequestParam("jobNum") String jobNum) {
-        return entryManageService.checkJobNum(jobNum);
+    public WeaResult<Map<String, Object>> checkJobNum(@RequestParam("jobNum") String jobNum,@RequestParam("userName") String userName) {
+        return entryManageService.checkJobNum(jobNum,userName);
     }
 
     @PostMapping("/uploadFiles")
diff --git a/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java b/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java
index dfdc150..3dd55be 100644
--- a/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java
+++ b/src/main/java/com/weaver/seconddev/entry/mapper/EntryManageMapper.java
@@ -21,6 +21,8 @@ public interface EntryManageMapper {
      */
     Long getEntryRecordIdByJobNum(@Param("param") BaseParam param, @Param("jobNum") String jobNum);
 
+    Long getEntryRecordIdByJobNumAndName(@Param("param") BaseParam param, @Param("jobNum") String jobNum,@Param("userName") String userName);
+
 
     Long updateFilesInfo(@Param("param") BaseParam param, @Param("employeeId") Long employeeId);
 }
diff --git a/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java b/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java
index 60c1725..f677cb9 100644
--- a/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java
+++ b/src/main/java/com/weaver/seconddev/entry/service/EntryManageService.java
@@ -15,9 +15,10 @@ public interface EntryManageService {
      * 校验工号
      *
      * @param jobNum 工号
+     * @param userName 姓名
      * @return
      */
-    WeaResult<Map<String, Object>> checkJobNum(String jobNum);
+    WeaResult<Map<String, Object>> checkJobNum(String jobNum,String userName);
 
     /**
      * 上传文件
diff --git a/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java b/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java
index 2bbac41..085f2d8 100644
--- a/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java
+++ b/src/main/java/com/weaver/seconddev/entry/service/impl/EntryManageServiceImpl.java
@@ -60,14 +60,14 @@ public class EntryManageServiceImpl implements EntryManageService {
     BaseParam baseParam = new BaseParam();
 
     @Override
-    public WeaResult<Map<String, Object>> checkJobNum(String jobNum) {
+    public WeaResult<Map<String, Object>> checkJobNum(String jobNum,String userName) {
         Map<String, Object> dataMap = new HashMap<>();
         dataMap.put("isExist", false);
         if (StringUtils.isBlank(jobNum)) {
             return WeaResult.fail("工号获取异常", true);
         }
 
-        Long empIdByJobNum = entryManageMapper.getEntryRecordIdByJobNum(baseParam, jobNum);
+        Long empIdByJobNum = entryManageMapper.getEntryRecordIdByJobNumAndName(baseParam, jobNum,userName);
         dataMap.put("isExist", null != empIdByJobNum);
         dataMap.put("empId", empIdByJobNum);
         return WeaResult.success(dataMap);
diff --git a/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml b/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml
index 315c41d..f34293c 100644
--- a/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml
+++ b/src/main/resources/mapper/entry/mapper/EntryManageMapper.xml
@@ -26,4 +26,10 @@
         where t1.tenant_key = #{param.tenantKey} and t1.delete_type = 0
         and t1.job_num = #{jobNum}
     </select>
+    <select id="getEntryRecordIdByJobNumAndName" resultType="java.lang.Long">
+        select t1.id from ${param.e10_common}.uf_jcl_employee_information t1
+        where t1.tenant_key = #{param.tenantKey} and t1.delete_type = 0
+        and t1.job_num = #{jobNum}
+        and t1.username = #{userName}
+    </select>
 </mapper>