|
@@ -1609,22 +1609,36 @@ public class WmSupervisionManager {
|
|
|
// 部门负责人意见
|
|
|
if (j == 9) {
|
|
|
List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
|
|
|
- WmTaskSupervisionAdvice advice = supervisionAdvices.get(0);
|
|
|
- datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
|
+ if (CollUtil.isNotEmpty(supervisionAdvices)) {
|
|
|
+ WmTaskSupervisionAdvice advice = supervisionAdvices.get(0);
|
|
|
+ datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
|
+ } else {
|
|
|
+ datas[idx][j] = "";
|
|
|
+ }
|
|
|
+
|
|
|
+
|
|
|
}
|
|
|
|
|
|
// 分管领导意见
|
|
|
if (j == 10) {
|
|
|
List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
|
|
|
- WmTaskSupervisionAdvice advice = supervisionAdvices.get(1);
|
|
|
- datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
|
+ if (CollUtil.isNotEmpty(supervisionAdvices)) {
|
|
|
+ WmTaskSupervisionAdvice advice = supervisionAdvices.get(1);
|
|
|
+ datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
|
+ } else {
|
|
|
+ datas[idx][j] = "";
|
|
|
+ }
|
|
|
}
|
|
|
|
|
|
// 总经理意见
|
|
|
if (j == 11) {
|
|
|
List<WmTaskSupervisionAdvice> supervisionAdvices = advices.get(wmTaskSupervision.getSupervisionId());
|
|
|
- WmTaskSupervisionAdvice advice = supervisionAdvices.get(2);
|
|
|
- datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
|
+ if (CollUtil.isNotEmpty(supervisionAdvices)) {
|
|
|
+ WmTaskSupervisionAdvice advice = supervisionAdvices.get(2);
|
|
|
+ datas[idx][j] = advice != null ? advice.getRemarks() : "";
|
|
|
+ } else {
|
|
|
+ datas[idx][j] = "";
|
|
|
+ }
|
|
|
|
|
|
}
|
|
|
|