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);