|
@@ -1622,7 +1622,7 @@ public class WmSupervisionManager {
|
|
// 分管领导意见
|
|
// 分管领导意见
|
|
if (j == 10) {
|
|
if (j == 10) {
|
|
List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
|
|
List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
|
|
- if (CollUtil.isNotEmpty(supervisionAdvices)) {
|
|
|
|
|
|
+ if (CollUtil.isNotEmpty(supervisionAdvices) && supervisionAdvices.size() > 1) {
|
|
WmTaskSupervisionAdvice advice = supervisionAdvices.get(1);
|
|
WmTaskSupervisionAdvice advice = supervisionAdvices.get(1);
|
|
datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
} else {
|
|
} else {
|
|
@@ -1633,7 +1633,7 @@ public class WmSupervisionManager {
|
|
// 总经理意见
|
|
// 总经理意见
|
|
if (j == 11) {
|
|
if (j == 11) {
|
|
List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
|
|
List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
|
|
- if (CollUtil.isNotEmpty(supervisionAdvices)) {
|
|
|
|
|
|
+ if (CollUtil.isNotEmpty(supervisionAdvices) && supervisionAdvices.size() > 2) {
|
|
WmTaskSupervisionAdvice advice = supervisionAdvices.get(2);
|
|
WmTaskSupervisionAdvice advice = supervisionAdvices.get(2);
|
|
datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
} else {
|
|
} else {
|