leon 2 лет назад
Родитель
Сommit
cfce3d5ef1

+ 7 - 2
launch-admin/src/main/java/com/webflux/launchadmin/mysql/controller/planNew/PlanNewOutController.java

@@ -662,8 +662,13 @@ public class PlanNewOutController {
                 if (Objects.nonNull(f9.getT1().id())) {
                     goRequest2.getItem().stream().filter(f1 -> "qrcode".equals(f1.getT())).forEach(fe->{
                         if (Objects.nonNull(fe.getV())) {
-                            String qrcode = fe.getV() + "&id=" + f9.getT1().id();
-                            fe.setV(qrcode);
+                            if (fe.getV().contains("?")){
+                                String qrcode = fe.getV() + "&id=" + f9.getT1().id();
+                                fe.setV(qrcode);
+                            }else{
+                                String qrcode = fe.getV() + "?id=" + f9.getT1().id();
+                                fe.setV(qrcode);
+                            }
                         }
                     });
                 }

+ 7 - 2
launch-admin/src/main/java/com/webflux/launchadmin/mysql/service/planNew/goGenerate/GoGenerateService.java

@@ -751,8 +751,13 @@ public class GoGenerateService {
                 GoRequest t21 = fff.getT2();
                 t21.getItem().stream().filter(f1 -> "qrcode".equals(f1.getT())).forEach(fe->{
                     if (Objects.nonNull(fe.getV())) {
-                        String qrcode = fe.getV() + "&id=" + fff.getT1().id();
-                        fe.setV(qrcode);
+                        if (fe.getV().contains("?")){
+                            String qrcode = fe.getV() + "&id=" + fff.getT1().id();
+                            fe.setV(qrcode);
+                        }else{
+                            String qrcode = fe.getV() + "?id=" + fff.getT1().id();
+                            fe.setV(qrcode);
+                        }
                     }
                 });
                 String s1 = JSONUtil.toJsonStr(t21);