From 29dd168b96742d39bda39829e8f6c74764ec40ab Mon Sep 17 00:00:00 2001
From: "liang.chao" <1360241448@qq.com>
Date: Mon, 21 Apr 2025 14:38:48 +0800
Subject: [PATCH] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E7=BB=8F=E7=90=86=E9=80=80?=
 =?UTF-8?q?=E5=9C=BA=E7=8F=AD=E7=BB=84=E5=A4=B1=E8=B4=A5bug=E4=BF=AE?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../evaluate/service/OrganizationalServiceImpl.java | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java
index d0b5c1a..101f3cc 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java
@@ -8,6 +8,7 @@ import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes;
 import com.bonus.gs.sub.evaluate.manager.utils.CipherHelper;
 import com.bonus.gs.sub.evaluate.manager.utils.StringHelper;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -129,7 +130,7 @@ public class OrganizationalServiceImpl implements OrganizationalService {
 //                String salt = CipherHelper.createSalt();
 //                bean.setSalt(salt);
 //                bean.setPassword(pwrsMD5);
-            }else if (bean.getLevel() == 4){
+            } else if (bean.getLevel() == 4) {
                 int count = mapper.getConsIsExistByPro(bean);
                 if (count > 0) {
                     ar.setFailMsg("该承包商在此项目下已存在");
@@ -253,7 +254,9 @@ public class OrganizationalServiceImpl implements OrganizationalService {
                 OrganizationalBean P3 = new OrganizationalBean();
                 P3.setId(data2.getParentId());
                 OrganizationalBean data3 = mapper.getDataDetails(P3);
-//                teamEvaluateBean.setProId(Integer.parseInt(data3.getTableId()));
+                if (StringUtils.isNotBlank(data3.getTableId())) {
+                    teamEvaluateBean.setProId(Integer.parseInt(data3.getTableId()));
+                }
                 teamEvaluateBean.setProName(data3.getName());
                 teamEvaluateBean.setOrgRelId(bean.getId());
                 mapper.insertTeamData(teamEvaluateBean);
@@ -303,8 +306,8 @@ public class OrganizationalServiceImpl implements OrganizationalService {
     public AjaxRes userOutDataFail(OrganizationalBean bean) {
         AjaxRes ar = new AjaxRes();
         try {
-           mapper.updateUserOutStatus(bean);
-           mapper.deleteUserOutData(bean);
+            mapper.updateUserOutStatus(bean);
+            mapper.deleteUserOutData(bean);
             ar.setSucceed("退场失败");
         } catch (Exception e) {
             ar.setResMsg("退场失败");
@@ -330,7 +333,7 @@ public class OrganizationalServiceImpl implements OrganizationalService {
                 .collect(Collectors.toList());
 
         if (!children.isEmpty()) {
-            for (OrganizationalBean vo:children){
+            for (OrganizationalBean vo : children) {
                 vo.setParentUserName(parent.getUserName());
             }
             parent.setChildren(children);