From 73626fa47ba5875db1fadedd2baef5c0df91b8da Mon Sep 17 00:00:00 2001 From: haozq <1611483981@qq.com> Date: Wed, 26 Feb 2025 18:54:36 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=B3=BB=E7=BB=9Fbug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/service/OutsourcerEvaluateServiceImpl.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) 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 5315399..7d8c26b 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 @@ -146,7 +146,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService childList.add(childMap); } } - oneList = oneList.stream().distinct().collect(Collectors.toList()); + // oneList = oneList.stream().distinct().collect(Collectors.toList()); Map upload = new LinkedHashMap<>(); upload.put("title", "操作"); upload.put("mergeType", "rowspan"); @@ -360,7 +360,6 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService public AjaxRes saveEvaluateData(EvaluateDataBean o) { AjaxRes ar = new AjaxRes(); try { - String deptId = UserUtil.getLoginUser().getDeptId(); String userId = String.valueOf(UserUtil.getLoginUser().getId()); o.setDeptId(deptId); @@ -1075,7 +1074,7 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService private void addSummaryMap(List> twoList, SetTemplateBean setTemplateBean, int childNum, int twoNum, String parentId) { //判断当前二级标题下是否有部门 且二级标题大于1 - if (childNum > 1 && setTemplateBean.getResponsibleDepartment().split(",").length > 1) { + if (childNum > 1 && setTemplateBean.getResponsibleDepartment().split(",").length > 0) { //添加小计 addChildMap(twoList, createTemplateBean("小计", setTemplateBean.getParentId(), setTemplateBean.getId()), 2, 2, parentId);