From ff1362c885789c2d044a7235a9a467cfef8aacbd Mon Sep 17 00:00:00 2001
From: dxc <jl-daixc@chinaunicom.cn>
Date: Tue, 4 Jan 2022 13:41:56 +0800
Subject: [PATCH] =?UTF-8?q?=E9=87=8D=E6=96=B0=E8=AF=84=E5=AE=A1=E8=B4=A6?=
 =?UTF-8?q?=E5=8F=B7=E5=A2=9E=E5=8A=A0=E6=AD=A3=E5=88=99=E8=A1=A8=E8=BE=BE?=
 =?UTF-8?q?=E5=BC=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mall/ebtp/project/common/ProjectCommonUtil.java      | 5 +++++
 .../service/impl/ProjectReEvaluationServiceImpl.java     | 9 +++++++++
 2 files changed, 14 insertions(+)

diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
index 1f6067d..a9567e0 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/common/ProjectCommonUtil.java
@@ -569,4 +569,9 @@ public class ProjectCommonUtil {
      * 集团编码
      */
     public static final String PROVINCES_BLOC = "001000";
+
+    /**
+     * 账号兼职正则表达式
+     */
+    public static final String REG_PATTEN = "^.+_\\d*$";
 }
diff --git a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
index 237241d..d72760c 100644
--- a/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
+++ b/src/main/java/com/chinaunicom/mall/ebtp/project/projectreevaluation/service/impl/ProjectReEvaluationServiceImpl.java
@@ -43,6 +43,7 @@ import org.springframework.transaction.annotation.Transactional;
 import javax.annotation.Resource;
 import java.time.LocalDateTime;
 import java.util.*;
+import java.util.regex.Pattern;
 import java.util.stream.Collectors;
 
 /**
@@ -247,6 +248,13 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
             CommonExceptionEnum.FRAME_EXCEPTION_COMMON_NOT_UPDATE.customValidName(baseResponse.getMessage(),!baseResponse.isSuccess());
         }
         LoginUserDetailVO loginUserDetailVO = baseResponse.getData();
+
+        //正则验证是否为兼职岗位
+        if (Pattern.matches(ProjectCommonUtil.REG_PATTEN, loginUserDetailVO.getStaffId())) {
+            log.info("查询用户中心，兼岗职位，id={}，ou={}", loginUserDetailVO.getStaffId(), loginUserDetailVO.getOu());
+            loginUserDetailVO.setStaffId(loginUserDetailVO.getStaffId().substring(0, loginUserDetailVO.getStaffId().indexOf("_")));
+        }
+
         approve.setWfSectionNo(wfSectionNo);
         approve.setWfSectionName(wfSectionName);
         approve.setBusinessType(record.getBidMethodSubDict());
@@ -273,6 +281,7 @@ public class ProjectReEvaluationServiceImpl extends BaseServiceImpl<ProjectReEva
         return response.getData();
     }
 
+
     /**
      * 修改重新评审信息状态
      * @param id 主键