From a939a6f2220d4306e50bbd6638c224c6653aa676 Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 26 Aug 2024 09:29:55 +0800
Subject: [PATCH] =?UTF-8?q?=E5=B2=97=E4=BD=8D=E7=BC=96=E5=8F=B7=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E9=83=A8=E9=97=A8id=E6=8B=BC=E6=8E=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../service/impl/FunctionOutStaffServiceImpl.java           | 4 +++-
 .../engine/organization/service/impl/JobServiceImpl.java    | 6 ++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
index 887b1723..20e172e7 100644
--- a/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
+++ b/src/com/engine/organization/service/impl/FunctionOutStaffServiceImpl.java
@@ -77,7 +77,9 @@ public class FunctionOutStaffServiceImpl {
 
     private Integer frozenStaffNums(StaffOutParam param) {
         StaffPO staffPO = select(param);
-        OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
+        if (param.getNum() < 0) {
+            OrganizationAssert.isFalse(staffPO.getFreezeNum() == 0, SystemEnv.getHtmlLabelName(547949,user.getLanguage()));
+        }
 
         List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum(),staffPO.getPermanentNum());
         //1.增加冻结数 （num为负数时为减少冻结数）
diff --git a/src/com/engine/organization/service/impl/JobServiceImpl.java b/src/com/engine/organization/service/impl/JobServiceImpl.java
index 26bf9692..a2d446d8 100644
--- a/src/com/engine/organization/service/impl/JobServiceImpl.java
+++ b/src/com/engine/organization/service/impl/JobServiceImpl.java
@@ -55,6 +55,7 @@ import org.apache.commons.lang.StringUtils;
 import weaver.general.StringUtil;
 import weaver.general.Util;
 import weaver.hrm.User;
+import weaver.hrm.job.JobTitlesComInfo;
 import weaver.systeminfo.SystemEnv;
 
 import java.util.*;
@@ -565,6 +566,7 @@ public class JobServiceImpl extends Service implements JobService {
 
     @Override
     public void refresh() {
+        JobTitlesComInfo jb = new JobTitlesComInfo();
         // 解决并发情况下，岗位数据重复问题
         synchronized (JobServiceImpl.class) {
             //1.人员表查询
@@ -582,6 +584,10 @@ public class JobServiceImpl extends Service implements JobService {
                             .createTime(new Date())
                             .updateTime(new Date())
                             .build();
+                    String jobTitlescode = jb.getJobTitlescode(String.valueOf(resourcePO.getJobtitle()));
+                    if (!"".equals(jobTitlescode)) {
+                        jobPO.setJobNo(jobTitlescode+"-"+resourcePO.getDepartmentid());
+                    }
                     getJobMapper().insertIgnoreNull(jobPO);
                 }
             });