From a016e3f59d1b2227cd22aeb82090b82d487c8235 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 十二月 2024 14:36:42 +0800
Subject: [PATCH] Merge branch 'master' into cnas
---
inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
index a57cadf..7e017cc 100644
--- a/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
+++ b/inspect-server/src/main/java/com/yuanchu/mom/service/impl/StandardProductListServiceImpl.java
@@ -161,10 +161,10 @@
int subIndex1 = -1;
int subIndex2 = -1;
for (int i = 0; i < subOrder.length; i++) {
- if (o1.getInspectionItemSubclass().equals(subOrder[i])) {
+ if (o1.getInspectionItemSubclass().contains(subOrder[i])) {
subIndex1 = i;
}
- if (o2.getInspectionItemSubclass().equals(subOrder[i])) {
+ if (o2.getInspectionItemSubclass().contains(subOrder[i])) {
subIndex2 = i;
}
if (subIndex1 != -1 && subIndex2 != -1) {
--
Gitblit v1.9.3