From 3c16e3bb29032371f284b46e746b3454af23ecc2 Mon Sep 17 00:00:00 2001
From: zhenggm <zhenggm@jujiatech.com>
Date: Tue, 2 Aug 2022 16:07:16 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=EF=BC=9AparseFromMap?=
 =?UTF-8?q?=E6=96=B9=E6=B3=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../framework/core/mvc/controller/binder/body/BeanBodyEditor.java | 2 +-
 .../core/mvc/controller/binder/body/SwMapBodyEditor.java          | 2 +-
 .../src/main/java/cc/smtweb/framework/core/util/JsonUtil.java     | 4 ++++
 smtweb-framework/core/src/main/resources/权限相关.json        | 8 ++++++++
 4 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java
index e950924..68a7590 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/BeanBodyEditor.java
@@ -33,7 +33,7 @@ public class BeanBodyEditor implements IEditor {
 
 	private Object getGetValue(String paramName, Class<?> paramType, Map<String, Object> params) {
 		if (paramName == null) {
-			return JsonUtil.parse(params, paramType);
+			return JsonUtil.parseSimple(params, paramType);
 		}
 
 		// Json字符进行类型转化
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java
index ca550c6..93e09f9 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/mvc/controller/binder/body/SwMapBodyEditor.java
@@ -30,7 +30,7 @@ public class SwMapBodyEditor implements IEditor {
 	}
 
 	private Object getGetValue(String paramName, Class<?> paramType, Map<String, Object> params, HttpServletRequest request) {
-		SwMap result = JsonUtil.parse(params, SwMap.class);
+		SwMap result = JsonUtil.parseSimple(params, SwMap.class);
 		request.setAttribute(BODY_MAP, result);
 		return getFieldValue(result, paramName);
 	}
diff --git a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java
index d049d96..e5adf75 100644
--- a/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java
+++ b/smtweb-framework/core/src/main/java/cc/smtweb/framework/core/util/JsonUtil.java
@@ -120,6 +120,10 @@ public class JsonUtil {
      * @return Bean对象实例
      */
     public static <T> T parse(Map map, Class<T> clazz) {
+        return parse(encodeString(map), clazz);
+    }
+
+    public static <T> T parseSimple(Map map, Class<T> clazz) {
         try {
             if (map == null || map.isEmpty()) {
                 return null;
diff --git a/smtweb-framework/core/src/main/resources/权限相关.json b/smtweb-framework/core/src/main/resources/权限相关.json
index e02e1d4..d325668 100644
--- a/smtweb-framework/core/src/main/resources/权限相关.json
+++ b/smtweb-framework/core/src/main/resources/权限相关.json
@@ -42,5 +42,13 @@
         "字段权限中的字段": "0-无/1-读/2-写"
       }
     }
+  ],
+  "人员分组.详细": [
+    {
+      "type": "类型，1-机构 2-部门 3-角色 4-人员 5-机构性质 5-部门性质",
+      "kind": "0-包含 1-排除",
+      "value": "值",
+      "rec": "树形结构有效：0-仅本级 1-含下级"
+    }
   ]
 }
\ No newline at end of file