Merge remote-tracking branch 'origin/developer' into developer

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/CustomThemeController.java

@@ -14,14 +14,14 @@ public class CustomThemeController {
     private CustomThemeApiService customThemeApiService;
 
     @RequestMapping("save-theme")
-    public RestResponse saveTheme(String appId, Integer theme, Integer type){
-        ServiceResponse<Integer> response = this.customThemeApiService.saveTheme(UserDetailUtils.getUserDetail().getEnterpriseId(), appId, theme, type);
+    public RestResponse saveTheme(String appid, Integer theme, Integer type){
+        ServiceResponse<Integer> response = this.customThemeApiService.saveTheme(UserDetailUtils.getUserDetail().getEnterpriseId(), appid, theme, type);
         return RestResponse.success(response.getResult());
     }
 
     @RequestMapping("get-theme")
-    public RestResponse getTheme(String appId){
-        ServiceResponse<Integer> theme = this.customThemeApiService.getTheme(UserDetailUtils.getUserDetail().getEnterpriseId(), appId);
+    public RestResponse getTheme(String appid){
+        ServiceResponse<Integer> theme = this.customThemeApiService.getTheme(UserDetailUtils.getUserDetail().getEnterpriseId(), appid);
         return RestResponse.success(theme.getResult());
     }
 }

gic-platform-enterprise-web/src/main/java/com/gic/enterprise/web/controller/QrcodeController.java

@@ -302,9 +302,14 @@ public class QrcodeController {
                                 }
                             }
                             if (StringUtils.isNotBlank(dto.getAppletIds())) {
+                                String appletPath = content.getContent();
+                                if(StringUtils.isBlank(appletPath)){
+                                    appletPath = "pages/index/index";
+                                }
+                                appletPath += "?qrcodeParam="+qrcodeId;
                                 String[] appletArr = dto.getAppletIds().split(",");
                                 for (String s : appletArr) {
-                                    byte[] appletQrcode = createAppletQrcode(s, content.getContent());
+                                    byte[] appletQrcode = createAppletQrcode(s, appletPath);
                                     if(appletQrcode != null){
                                         ZipEntry e = new ZipEntry(content.getTitle() + File.separator + s + File.separator + content.getTitle() + ".jpg");
                                         zipOutputStream.putNextEntry(e);