Переглянути джерело

修改责任中心名称显示

ljx 4 роки тому
батько
коміт
4108bcb07d

+ 6 - 3
src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupSetServiceImpl.java

@@ -65,13 +65,16 @@ public class CostIncomeGroupSetServiceImpl extends ServiceImpl<CostIncomeGroupSe
         if (!CollectionUtils.isEmpty(responsibilityList)) {
             final Map<String, String> listMap = responsibilityList.stream().collect(Collectors.toMap(Responsibility::getResponsibilityCode, Responsibility::getResponsibilityName));
             costIncomeGroupSetVOList.forEach(i -> {
+                List<String> responsibilityNameList = new LinkedList<>();
                 String responsibilityCode = i.getResponsibilityCodes();
                 if (!StringUtils.isEmpty(responsibilityCode)){
                     List<String> responsibilityCodeList = Arrays.asList(responsibilityCode.split(StrUtil.SLASH));
-                    if (CollectionUtils.isEmpty(responsibilityCodeList)) {
-                        String responsibilityName = listMap.get(responsibilityCodeList.get(responsibilityCodeList.size()-1));
-                        i.setResponsibilityName(responsibilityName);
+                    if (!CollectionUtils.isEmpty(responsibilityCodeList)) {
+                        responsibilityCodeList.forEach(m->{
+                            responsibilityNameList.add(listMap.get(m));
+                        });
                     }
+                    i.setResponsibilityName(String.join("/", responsibilityNameList));
                 }
                 if (NumberConstant.ONE.equals(i.getOpenDepartmentStatus()) && NumberConstant.ONE.equals(i.getStartDepartmentStatus())){
                     i.setAccountStatus(NumberConstant.ONE);