Merge branch 'master' of huangrui/CostAccount into dev

src/main/java/com/imed/costaccount/service/impl/CostIncomeGroupServiceImpl.java

@@ -495,10 +495,10 @@ public class CostIncomeGroupServiceImpl extends ServiceImpl<CostIncomeGroupMappe
                         afterIncomegroup.setResponsibilityCode(responsibility.getResponsibilityCode());
                         afterIncomegroup.setResponsibilityName(responsibility.getResponsibilityName());
                     }
-                }else if (NumberConstant.ONE.equals(openDepartmentStatus) && NumberConstant.ZERO.equals(startDepartmentStatus)){
+                }else if (NumberConstant.ONE.equals(openDepartmentStatus) && NumberConstant.TWO.equals(startDepartmentStatus)){
                     afterIncomegroup.setResponsibilityCode(costIncomeGroup.getOpenResponsibilityCode());
                     afterIncomegroup.setResponsibilityName(costIncomeGroup.getOpenResponsibilityName());
-                }if (NumberConstant.ZERO.equals(openDepartmentStatus) && NumberConstant.ONE.equals(startDepartmentStatus)){
+                }if (NumberConstant.TWO.equals(openDepartmentStatus) && NumberConstant.ONE.equals(startDepartmentStatus)){
                     afterIncomegroup.setResponsibilityCode(costIncomeGroup.getStartResponsibilityCode());
                     afterIncomegroup.setResponsibilityName(costIncomeGroup.getStartResponsibilityName());
                 }

src/main/java/com/imed/costaccount/service/impl/IncomeCollectionServiceImpl.java

@@ -260,7 +260,7 @@ public class IncomeCollectionServiceImpl
             Map<Integer, Object> map = new HashMap<>();
             for (int i = 0; i < responsibilities.size(); i++) {
                 if (i == 0) {
-                    map.put(i + 1, accounts.get(i).getName());
+                    map.put(i + 1, account.getName());
                     continue;
                 } else if (i == responsibilities.size() - 1) {
                     // TODO: 2021/8/12 合计