Procházet zdrojové kódy

feat:导出监督报告 4

shc před 7 měsíci
rodič
revize
c4d91dc16f

+ 2 - 2
hnqz-upms/hnqz-upms-biz/src/main/java/com/qunzhixinxi/hnqz/admin/manager/WmSupervisionManager.java

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