liux
/
gs_sub_evaluate
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

项目经理退场班组失败bug修改

This commit is contained in:
liang.chao 2025-04-21 14:38:48 +08:00
parent 651546194a
commit 29dd168b96
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java
View File

@ -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.CipherHelper;
import com.bonus.gs.sub.evaluate.manager.utils.StringHelper; import com.bonus.gs.sub.evaluate.manager.utils.StringHelper;
import lombok.extern.slf4j.Slf4j; import lombok.extern.slf4j.Slf4j;
import org.apache.commons.lang3.StringUtils;
import org.springframework.beans.BeanUtils; import org.springframework.beans.BeanUtils;
import org.springframework.beans.factory.annotation.Autowired; import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service; import org.springframework.stereotype.Service;
@ -129,7 +130,7 @@ public class OrganizationalServiceImpl implements OrganizationalService {
// String salt = CipherHelper.createSalt(); // String salt = CipherHelper.createSalt();
// bean.setSalt(salt); // bean.setSalt(salt);
// bean.setPassword(pwrsMD5); // bean.setPassword(pwrsMD5);
}else if (bean.getLevel() == 4){ } else if (bean.getLevel() == 4) {
int count = mapper.getConsIsExistByPro(bean); int count = mapper.getConsIsExistByPro(bean);
if (count > 0) { if (count > 0) {
ar.setFailMsg("该承包商在此项目下已存在"); ar.setFailMsg("该承包商在此项目下已存在");
@ -253,7 +254,9 @@ public class OrganizationalServiceImpl implements OrganizationalService {
OrganizationalBean P3 = new OrganizationalBean(); OrganizationalBean P3 = new OrganizationalBean();
P3.setId(data2.getParentId()); P3.setId(data2.getParentId());
OrganizationalBean data3 = mapper.getDataDetails(P3); 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.setProName(data3.getName());
teamEvaluateBean.setOrgRelId(bean.getId()); teamEvaluateBean.setOrgRelId(bean.getId());
mapper.insertTeamData(teamEvaluateBean); mapper.insertTeamData(teamEvaluateBean);
@ -330,7 +333,7 @@ public class OrganizationalServiceImpl implements OrganizationalService {
.collect(Collectors.toList()); .collect(Collectors.toList());
if (!children.isEmpty()) { if (!children.isEmpty()) {
for (OrganizationalBean vo:children){ for (OrganizationalBean vo : children) {
vo.setParentUserName(parent.getUserName()); vo.setParentUserName(parent.getUserName());
} }
parent.setChildren(children); parent.setChildren(children);