小程序装修页面调整

gic-platform-enterprise-service/src/main/java/com/gic/enterprise/service/outer/impl/AppletCustomPageApiServiceImpl.java

@@ -59,23 +59,11 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
     @Override
     public ServiceResponse<Integer> saveOrUpdate(String param, Integer pageId, Integer enterpriseId, Integer saveType,
             Integer appType, String appId) {
-        //是否是新增。
-        //如今新增操作流程调整，第一步只新增页面公用参数，组件不会有。
-        boolean isAddOperation = pageId == null;
-
-        TabAppletCustomPage getById = null;
-        if (!isAddOperation) {
-            getById = exist(pageId);
-            if (getById.getEnterpriseId() == -1 && enterpriseId != -1) {
-                isAddOperation = true;
-                pageId = null;
-            }
-        }
-
         ServiceResponse valiParams = this.validParams(enterpriseId, saveType, appType, appId, param);
         if(!valiParams.isSuccess()){
             return valiParams;
         }
+
         JSONObject jsonObject = JSONObject.parseObject(param);
         String title = jsonObject.getString("title");
         //0代表不限，1代表开卡会员，2代表认证会员
@@ -85,6 +73,28 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
         if (quickGuideSwitch == null) {
             quickGuideSwitch = 1;
         }
+        //是否是新增。
+        //如今新增操作流程调整，第一步只新增页面公用参数，组件不会有。
+        boolean isAddOperation = pageId == null;
+
+        TabAppletCustomPage getById = null;
+        if (!isAddOperation) {
+            getById = exist(pageId);
+            if (getById.getEnterpriseId() == -1 && enterpriseId != -1) {
+                isAddOperation = true;
+                pageId = null;
+            }
+        } else {
+            if (enterpriseId == -1) {
+                //默认数据配置
+                TabAppletCustomPage defaultPage = getDefaultPage(pageType);
+                if (defaultPage != null) {
+                    pageId = defaultPage.getPageId();
+                    isAddOperation = false;
+                }
+            }
+        }
+
         String backgroundColor = jsonObject.getString("backgroundColor");
         Integer backgroundType = jsonObject.getInteger("backgroundType");
         String backgroundImage = jsonObject.getString("backgroundImage");
@@ -139,7 +149,7 @@ public class AppletCustomPageApiServiceImpl implements AppletCustomPageApiServic
             record.setDeleteFlag(0);
             pageId = appletCustomPageService.save(record);
         } else {
-            if (getById.getEnterpriseId().intValue() == -1) {
+            if (getById.getEnterpriseId() == -1 && enterpriseId != -1) {
                 //如果编辑的是默认数据，则变成新增一条一摸一样的数据
                 record.setStatus(1);
                 pageId = appletCustomPageService.save(record);