|
@@ -272,15 +272,18 @@ public class TBranchPlanController extends BaseController
|
|
|
}
|
|
|
|
|
|
String personInCharge = "";
|
|
|
- String[] split = tBranchPlanItem.getPersonInCharge().split(",");
|
|
|
- for (String s : split) {
|
|
|
- for (Long key : userMap.keySet()) {
|
|
|
- if (key.toString().equals(s)) {
|
|
|
- personInCharge += userMap.get(key) + "、";
|
|
|
+ String personInCharge1 = tBranchPlanItem.getPersonInCharge();
|
|
|
+ if (StringUtils.isNotNull(personInCharge1)) {
|
|
|
+ String[] split = personInCharge1.split(",");
|
|
|
+ for (String s : split) {
|
|
|
+ for (Long key : userMap.keySet()) {
|
|
|
+ if (key.toString().equals(s)) {
|
|
|
+ personInCharge += userMap.get(key) + "、";
|
|
|
+ }
|
|
|
}
|
|
|
}
|
|
|
+ tBranchPlanItem.setPersonInCharge(personInCharge.substring(0, personInCharge.length() - 1));
|
|
|
}
|
|
|
- tBranchPlanItem.setPersonInCharge(personInCharge.substring(0, personInCharge.length() - 1));
|
|
|
|
|
|
for (Long key : planMap.keySet()) {
|
|
|
if (key.toString().equals(tBranchPlanItem.getPlanId().toString())) {
|