|
@@ -377,21 +377,21 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
|
|
if (ofYear.getOrganDivision().contains(",")) {
|
|
if (ofYear.getOrganDivision().contains(",")) {
|
|
String[] split = ofYear.getOrganDivision().split(",");
|
|
String[] split = ofYear.getOrganDivision().split(",");
|
|
for (String s : split) {
|
|
for (String s : split) {
|
|
- SysDept infoTow = deptMapper.checkDeptNameOnlyOne(ofYear.getOrganDivision());
|
|
|
|
|
|
+ SysDept infoTow = deptMapper.checkDeptNameOnlyOne(s);
|
|
//不是最后一位就加‘,’,是就直接结尾
|
|
//不是最后一位就加‘,’,是就直接结尾
|
|
if (!ofYear.getOrganDivision().endsWith(s)) {
|
|
if (!ofYear.getOrganDivision().endsWith(s)) {
|
|
if (!ObjectUtils.isEmpty(infoTow)) {
|
|
if (!ObjectUtils.isEmpty(infoTow)) {
|
|
zBuilder.append(infoTow.getDeptId() + ",");
|
|
zBuilder.append(infoTow.getDeptId() + ",");
|
|
} else {
|
|
} else {
|
|
++failureNum;
|
|
++failureNum;
|
|
- failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofYear.getOrganDivision() + "”不存在");
|
|
|
|
|
|
+ failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在");
|
|
}
|
|
}
|
|
} else {
|
|
} else {
|
|
if (!ObjectUtils.isEmpty(infoTow)) {
|
|
if (!ObjectUtils.isEmpty(infoTow)) {
|
|
zBuilder.append(infoTow.getDeptId());
|
|
zBuilder.append(infoTow.getDeptId());
|
|
} else {
|
|
} else {
|
|
++failureNum;
|
|
++failureNum;
|
|
- failureMsg.append(failureNum + "、机关业务指导处(科)“" + ofYear.getOrganDivision() + "”不存在");
|
|
|
|
|
|
+ failureMsg.append(failureNum + "、机关业务指导处(科)“" + s + "”不存在");
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|
|
}
|