购物车2.0

tnc-sms/src/main/java/org/jeecg/modules/smscheck/controller/SmsCheckCustomerInfoController.java

@@ -1477,6 +1477,7 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
     @GetMapping(value = "/phone/customerPhone")
     public Result<?> customerPhone(@RequestParam Map<String, String> parameterMap) {
         String customerNo = parameterMap.get("customerNo");
+        String stepsId = parameterMap.get("stepsId");
         try {
 
             LoginUser sysUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
@@ -1512,8 +1513,10 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                     declaredField.setAccessible(true);
                     Object value = declaredField.get(lotCustomerData);
                     if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
-                        List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                        filesDataVos.addAll(filesDataVos1);
+                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                            filesDataVos.addAll(filesDataVos1);
+                        }
                     }
                 }
             }
@@ -1524,8 +1527,10 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                     declaredField.setAccessible(true);
                     Object value = declaredField.get(smsTruckCustomerData);
                     if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
-                        List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                        filesDataVos.addAll(filesDataVos1);
+                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                            filesDataVos.addAll(filesDataVos1);
+                        }
                     }
                 }
             }
@@ -1536,8 +1541,10 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                     declaredField.setAccessible(true);
                     Object value = declaredField.get(customerData);
                     if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")&& !value.toString().isEmpty()) {
-                        List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                        filesDataVos.addAll(filesDataVos1);
+                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                            filesDataVos.addAll(filesDataVos1);
+                        }
                     }
                 }
             }
@@ -1548,8 +1555,10 @@ public class SmsCheckCustomerInfoController extends JeecgController<SmsCheckCust
                     declaredField.setAccessible(true);
                     Object value = declaredField.get(specialExamination);
                     if (declaredField.isAnnotationPresent(MyCustomAnnotation.class)&& value!=null && !value.toString().equals("[{}]")) {
-                        List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
-                        filesDataVos.addAll(filesDataVos1);
+                        if (StringUtils.isNotBlank(stepsId) && declaredField.getName().equals(stepsId)){
+                            List<FilesDataVo> filesDataVos1 = JSONArray.parseArray(value.toString(), FilesDataVo.class);
+                            filesDataVos.addAll(filesDataVos1);
+                        }
                     }
                 }
             }