diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java index e300797..4f274b6 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/OutsourcerEvaluateDao.java @@ -151,4 +151,6 @@ public interface OutsourcerEvaluateDao { List getPjEvaluateResultDeptId(EvaluateDataBean o); List getPjTaskEvaluatedPostId(EvaluateDataBean o); + + List getOrgList(); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java index f945944..d193f8f 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java @@ -47,7 +47,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService } @Override - public AjaxRes getTableTitle(EvaluateSubBean o) { + public AjaxRes getTableTitle(EvaluateSubBean o) { AjaxRes ar = new AjaxRes(); String deptId = (StringUtils.isBlank(o.getDeptId()) || "0".equals(o.getDeptId())) ? "0" : o.getDeptId(); String deptName = (StringUtils.isBlank(o.getDeptId()) || "0".equals(o.getDeptId())) ? "项目部" : dao.getDeptNameById(deptId); @@ -513,7 +513,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService } } outsourcerEvaluateDao.deleteEvaluateData(o); - outsourcerEvaluateDao.updateEvalStatus("2",o.getEvaluateId()); + outsourcerEvaluateDao.updateEvalStatus("2", o.getEvaluateId()); outsourcerEvaluateDao.saveEvaluateData(detailsList); o.setIsApprove("0"); o.setEvaluateType("3"); @@ -1217,7 +1217,12 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService @Override public List getTeamEvaluateList(OutSourceBean o) { o.setUserId(UserUtil.getLoginUser().getId().toString()); - o.setDeptId(UserUtil.getLoginUser().getDeptId()); + List orgList = dao.getOrgList(); + if (orgList.size() > 0 && orgList.contains(UserUtil.getLoginUser().getDeptId())) { + o.setDeptId("-1"); + } else { + o.setDeptId(UserUtil.getLoginUser().getDeptId()); + } return dao.getTeamEvaluateList(o); } diff --git a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml index 0c08289..9a02cb1 100644 --- a/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml +++ b/src/main/resources/mappers/evaluate/OutsourcerEvaluateMapper.xml @@ -802,6 +802,14 @@ + update pj_evaluate_record set task_status = #{taskStatus} where evaluate_id = #{evaluateId}