diff --git a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
index 7f5cf607..6a2deb7a 100644
--- a/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
+++ b/nflg-qms-admin/src/main/java/com/nflg/qms/admin/service/QmsIssueTicketControllerService.java
@@ -1171,14 +1171,17 @@ public class QmsIssueTicketControllerService {
.setId(record.getId())
.setName(record.getName())
.setLegend(record.getLegend())
- .setUnqualifiedQty(0)
- .setImageIds(record.getImageIds());
+ .setUnqualifiedQty(0);
records.add(r1);
return r1;
});
r.setUnqualifiedQty(r.getUnqualifiedQty() + record.getUnqualifiedQty());
- if (StrUtil.isNotBlank(r.getImageIds())) {
- r.setImageIds(StrUtil.join(",", r.getImageIds(), record.getImageIds()));
+ if (StrUtil.isNotBlank(record.getImageIds())) {
+ if(StrUtil.isBlank(r.getImageIds())){
+ r.setImageIds(record.getImageIds());
+ }else {
+ r.setImageIds(StrUtil.join(",", r.getImageIds(), record.getImageIds()));
+ }
}
});
records.stream()
diff --git a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml
index a57b2ca4..30307fb3 100644
--- a/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml
+++ b/nflg-wms-repository/src/main/resources/mapper/QmsIncomingInspectionTaskRecordItemMapper.xml
@@ -4,10 +4,13 @@