一些修改

sdBusiness/src/main/java/com/sdtool/business/service/mall/DesignServiceImpl.java

@@ -356,51 +356,54 @@ public class DesignServiceImpl extends BaseService implements DesignService {
         }.getType(), template.getString("objects"));
 
         objects.forEach(object -> {
-            if (!object.get("id").equals("WorkSpaceDrawType") && object.get("name").equals("textbox")) {
-                //字
-                List<String> permsList = jsonConvert.convertFrom(new TypeToken<List<String>>() {
-                }.getType(), object.get("permissionsConfig").toString());
-                if (permsList.contains("0")) {
-                    //文字内容
-                    object.put("editable", true);
-                } else {
-                    object.put("editable", false);
-                }
-
-                if (permsList.contains("5")) {
-                    //大小
-                    object.put("hasControls", true);
-                } else {
-                    object.put("hasControls", false);
-                }
-
-                if (permsList.contains("6")) {
-                    //位置
-                    object.put("lockMovementX", false);
-                    object.put("lockMovementY", false);
-                } else {
-                    object.put("lockMovementX", true);
-                    object.put("lockMovementY", true);
-                }
-            } else if (!object.get("id").equals("WorkSpaceDrawType") && object.get("name").equals("image")) {
-                //图
-                List<String> permsList = jsonConvert.convertFrom(new TypeToken<List<String>>() {
-                }.getType(), object.get("permissionsConfig").toString());
-
-                if (permsList.contains("1")) {
-                    //大小
-                    object.put("hasControls", true);
-                } else {
-                    object.put("hasControls", false);
-                }
-
-                if (permsList.contains("2")) {
-                    //位置
-                    object.put("lockMovementX", false);
-                    object.put("lockMovementY", false);
-                } else {
-                    object.put("lockMovementX", true);
-                    object.put("lockMovementY", true);
+            //此处要处理permissionsConfig为null的情况
+            if (object.get("permissionsConfig") != null) {
+                if (!object.get("id").equals("WorkSpaceDrawType") && object.get("name").equals("textbox")) {
+                    //字
+                    List<String> permsList = jsonConvert.convertFrom(new TypeToken<List<String>>() {
+                    }.getType(), object.get("permissionsConfig").toString());
+                    if (permsList.contains("0")) {
+                        //文字内容
+                        object.put("editable", true);
+                    } else {
+                        object.put("editable", false);
+                    }
+
+                    if (permsList.contains("5")) {
+                        //大小
+                        object.put("hasControls", true);
+                    } else {
+                        object.put("hasControls", false);
+                    }
+
+                    if (permsList.contains("6")) {
+                        //位置
+                        object.put("lockMovementX", false);
+                        object.put("lockMovementY", false);
+                    } else {
+                        object.put("lockMovementX", true);
+                        object.put("lockMovementY", true);
+                    }
+                } else if (!object.get("id").equals("WorkSpaceDrawType") && object.get("name").equals("image")) {
+                    //图
+                    List<String> permsList = jsonConvert.convertFrom(new TypeToken<List<String>>() {
+                    }.getType(), object.get("permissionsConfig").toString());
+
+                    if (permsList.contains("1")) {
+                        //大小
+                        object.put("hasControls", true);
+                    } else {
+                        object.put("hasControls", false);
+                    }
+
+                    if (permsList.contains("2")) {
+                        //位置
+                        object.put("lockMovementX", false);
+                        object.put("lockMovementY", false);
+                    } else {
+                        object.put("lockMovementX", true);
+                        object.put("lockMovementY", true);
+                    }
                 }
             }
         });

sdCommon/src/main/java/com/sdtool/common/entity/design/invoke/QueryBody.java

@@ -0,0 +1,26 @@
+package com.sdtool.common.entity.design.invoke;
+
+import com.sweetfish.source.PageFlipper;
+import org.rex.RMap;
+
+public class QueryBody {
+    private RMap params;
+
+    private PageFlipper pages;
+
+    public RMap getParams() {
+        return params;
+    }
+
+    public void setParams(RMap params) {
+        this.params = params;
+    }
+
+    public PageFlipper getPages() {
+        return pages;
+    }
+
+    public void setPages(PageFlipper pages) {
+        this.pages = pages;
+    }
+}

sdWebCore/src/main/java/com/sdtool/webcore/rest/InvokeRest.java

@@ -8,6 +8,7 @@ import com.sdtool.common.datas.HttpCode;
 import com.sdtool.common.entity.design.DesignFont;
 import com.sdtool.common.entity.design.DesignOrder;
 import com.sdtool.common.entity.design.DesignTemplate;
+import com.sdtool.common.entity.design.invoke.QueryBody;
 import com.sdtool.common.entity.site.ERPTokenUser;
 import com.sweetfish.net.http.*;
 import com.sweetfish.service.Local;
@@ -44,9 +45,10 @@ public class InvokeRest extends BaseService {
     @RestMapping(name = "queryDesignTemplates", auth = false, sort = 1, comment = "获取设计模板", methods = {"POST"})
     @WebApiBean(result = true, type = DesignTemplate.class)
     public CompletableFuture<RMap> queryDesignTemplates(
-            @RestParam(name = "params", comment = "搜索内容", required = false) RMap searchData,
-            @RestParam(name = "page", comment = "分页信息", required = false) PageFlipper pageFlipper,
-            @RestParam(name = "orderBy", comment = "排序", required = false) String orderBy,
+//            @RestParam(name = "params", comment = "搜索内容", required = false) RMap searchData,
+//            @RestParam(name = "page", comment = "分页信息", required = false) PageFlipper pageFlipper,
+//            @RestParam(name = "orderBy", comment = "排序", required = false) String orderBy,
+            @RestBody(comment = "支持body传入") QueryBody queryBody,
             @RestParam(name = "&", comment = "登录用户，无需传入") ERPTokenUser currentUser,
             @RestHeader(name = ERPHeader.HTTPHEADER_DATASOURCE) String dataSourceId,
             @RestHeader(name = ERPHeader.HTTPHEADER_SUPPLIER) String supplierCode,
@@ -57,6 +59,9 @@ public class InvokeRest extends BaseService {
                         logger.info("invoke拒绝访问:" + clientIp);
                         return RMapUtils.error(HttpCode.BAD_REQUEST.value(), "无权限访问");
                     }
+
+                    PageFlipper pageFlipper = queryBody.getPages();
+                    RMap searchData = queryBody.getParams();
                     RMap params = new RMap();
                     if (searchData != null) {
                         params.putAll(searchData);
@@ -126,9 +131,10 @@ public class InvokeRest extends BaseService {
             @RestCookie(name = "ow") String clientCookie) {
         return CompletableFuture.supplyAsync(
                 () -> {
-                    if (!canAccessClient(clientCookie)) {
-                        return RMapUtils.error(HttpCode.BAD_REQUEST.value(), "无权限访问");
-                    }
+                    //25-02-06 他们不限制了
+//                    if (!canAccessClient(clientCookie)) {
+//                        return RMapUtils.error(HttpCode.BAD_REQUEST.value(), "无权限访问");
+//                    }
                     RetResult<DesignTemplate> result = designService.getDesignTemplateEdit(id, params, outerSessionId, dataSourceId, Long.parseLong(supplierCode));
                     if (result.isSuccess())
                         return RMapUtils.successV2(result.getResult(), null, result.getPageFlipper());
@@ -148,9 +154,10 @@ public class InvokeRest extends BaseService {
             @RestCookie(name = "ow") String clientCookie) {
         return CompletableFuture.supplyAsync(
                 () -> {
-                    if (!canAccessClient(clientCookie)) {
-                        return RMapUtils.error(HttpCode.BAD_REQUEST.value(), "无权限访问");
-                    }
+                    //25-02-06 他们不限制了
+//                    if (!canAccessClient(clientCookie)) {
+//                        return RMapUtils.error(HttpCode.BAD_REQUEST.value(), "无权限访问");
+//                    }
                     RetResult<DesignOrder> result = designService.newDesignOrder(outerSessionId, svgContent, dataSourceId, Long.parseLong(supplierCode), currentUser);
                     if (result.isSuccess())
                         return RMapUtils.successV2(result.getResult(), null, result.getPageFlipper());