From fe4ea75b5a1f912c385c1533f17e3d3d7f123fc1 Mon Sep 17 00:00:00 2001
From: WenG <450292408@qq.com>
Date: Wed, 17 Feb 2021 21:06:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=8C=E5=96=84=E8=A1=A8=E5=8D=95=E5=AD=97?=
 =?UTF-8?q?=E6=AE=B5=E9=95=BF=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../pojo/dtos/permission/PermissionDTO.java   | 53 +++++++------------
 .../main/resources/templates/area/save.html   | 20 +++----
 .../main/resources/templates/area/update.html | 20 +++----
 .../main/resources/templates/data/save.html   |  4 +-
 .../main/resources/templates/data/update.html |  4 +-
 .../permission/pojo/vos/PermissionVO.java     | 24 ++++-----
 .../mybatis/mapper/permission-mapper.xml      | 21 ++++----
 .../resources/templates/permission/list.html  |  4 +-
 .../resources/templates/permission/save.html  | 18 +++----
 .../templates/permission/update.html          | 36 +++----------
 .../templates/department/save-merge.html      | 18 +++----
 .../templates/department/save-split.html      | 18 +++----
 .../resources/templates/department/save.html  | 12 ++---
 .../templates/department/update-split.html    | 18 +++----
 .../templates/department/update.html          | 20 +++----
 .../main/resources/templates/group/save.html  |  4 +-
 .../resources/templates/group/update.html     |  4 +-
 .../main/resources/templates/menu/save.html   |  8 +--
 .../main/resources/templates/menu/update.html |  8 +--
 .../resources/templates/position/save.html    |  6 +--
 .../resources/templates/position/update.html  |  6 +--
 .../impl/RolePermissionServiceImpl.java       |  8 +--
 22 files changed, 146 insertions(+), 188 deletions(-)

diff --git a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/permission/PermissionDTO.java b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/permission/PermissionDTO.java
index 7932cd87..80218d5f 100644
--- a/basic-pojo/src/main/java/ink/wgink/pojo/dtos/permission/PermissionDTO.java
+++ b/basic-pojo/src/main/java/ink/wgink/pojo/dtos/permission/PermissionDTO.java
@@ -4,7 +4,6 @@ import io.swagger.annotations.ApiModel;
 import io.swagger.annotations.ApiModelProperty;
 
 /**
- *
  * @ClassName: PermissionDTO
  * @Description: 权限
  * @Author: WenG
@@ -22,15 +21,13 @@ public class PermissionDTO {
     private String permissionType;
     @ApiModelProperty(name = "permissionUrl", value = "权限路径")
     private String permissionUrl;
-    @ApiModelProperty(name = "permissionClientId", value = "客户端")
-    private String permissionClientId;
-    @ApiModelProperty(name = "permissionClientName", value = "客户端字典名称")
-    private String permissionClientName;
+    @ApiModelProperty(name = "systemTag", value = "系统标识")
+    private String systemTag;
     @ApiModelProperty(name = "isPublic", value = "是否公共")
     private Integer isPublic;
 
     public String getPermissionId() {
-        return permissionId == null ? "" : permissionId;
+        return permissionId == null ? "" : permissionId.trim();
     }
 
     public void setPermissionId(String permissionId) {
@@ -46,7 +43,7 @@ public class PermissionDTO {
     }
 
     public String getPermissionType() {
-        return permissionType == null ? "" : permissionType;
+        return permissionType == null ? "" : permissionType.trim();
     }
 
     public void setPermissionType(String permissionType) {
@@ -54,31 +51,23 @@ public class PermissionDTO {
     }
 
     public String getPermissionUrl() {
-        return permissionUrl == null ? "" : permissionUrl;
+        return permissionUrl == null ? "" : permissionUrl.trim();
     }
 
     public void setPermissionUrl(String permissionUrl) {
         this.permissionUrl = permissionUrl;
     }
 
-    public String getPermissionClientId() {
-        return permissionClientId == null ? "" : permissionClientId;
+    public String getSystemTag() {
+        return systemTag == null ? "" : systemTag.trim();
     }
 
-    public void setPermissionClientId(String permissionClientId) {
-        this.permissionClientId = permissionClientId;
-    }
-
-    public String getPermissionClientName() {
-        return permissionClientName == null ? "" : permissionClientName.trim();
-    }
-
-    public void setPermissionClientName(String permissionClientName) {
-        this.permissionClientName = permissionClientName;
+    public void setSystemTag(String systemTag) {
+        this.systemTag = systemTag;
     }
 
     public Integer getIsPublic() {
-        return isPublic == null ? 0 : isPublic;
+        return isPublic;
     }
 
     public void setIsPublic(Integer isPublic) {
@@ -88,18 +77,16 @@ public class PermissionDTO {
     @Override
     public String toString() {
         final StringBuilder sb = new StringBuilder("{");
-        sb.append("\"permissionId\":")
-                .append("\"").append(permissionId).append("\"");
-        sb.append(",\"permissionTitle\":")
-                .append("\"").append(permissionTitle).append("\"");
-        sb.append(",\"permissionType\":")
-                .append("\"").append(permissionType).append("\"");
-        sb.append(",\"permissionUrl\":")
-                .append("\"").append(permissionUrl).append("\"");
-        sb.append(",\"permissionClientId\":")
-                .append("\"").append(permissionClientId).append("\"");
-        sb.append(",\"permissionClientName\":")
-                .append("\"").append(permissionClientName).append("\"");
+        sb.append("\"permissionId\":\"")
+                .append(permissionId).append('\"');
+        sb.append(",\"permissionTitle\":\"")
+                .append(permissionTitle).append('\"');
+        sb.append(",\"permissionType\":\"")
+                .append(permissionType).append('\"');
+        sb.append(",\"permissionUrl\":\"")
+                .append(permissionUrl).append('\"');
+        sb.append(",\"systemTag\":\"")
+                .append(systemTag).append('\"');
         sb.append(",\"isPublic\":")
                 .append(isPublic);
         sb.append('}');
diff --git a/module-dictionary/src/main/resources/templates/area/save.html b/module-dictionary/src/main/resources/templates/area/save.html
index 729ded30..ae9a5004 100644
--- a/module-dictionary/src/main/resources/templates/area/save.html
+++ b/module-dictionary/src/main/resources/templates/area/save.html
@@ -31,37 +31,37 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaName" lay-verify="required" placeholder="请输入地区名称" class="layui-input">
+                        <input type="text" name="areaName" lay-verify="required" placeholder="请输入地区名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区编码 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaCode" lay-verify="required" placeholder="请输入地区编码" class="layui-input">
+                        <input type="text" name="areaCode" lay-verify="required" placeholder="请输入地区编码" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">城市编码</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaCityCode" placeholder="请输入城市编码" class="layui-input">
+                        <input type="text" name="areaCityCode" placeholder="请输入城市编码" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">合并名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaMergerName" lay-verify="required" placeholder="请输入合并名称" class="layui-input">
+                        <input type="text" name="areaMergerName" lay-verify="required" placeholder="请输入合并名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区简称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaShortName" lay-verify="required" placeholder="请输入地区简称" class="layui-input">
+                        <input type="text" name="areaShortName" lay-verify="required" placeholder="请输入地区简称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">邮政编码 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaZipCode" lay-verify="required" placeholder="请输入邮政编码" class="layui-input">
+                        <input type="text" name="areaZipCode" lay-verify="required" placeholder="请输入邮政编码" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -79,25 +79,25 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区经度</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaLng" placeholder="请输入地区经度" class="layui-input">
+                        <input type="text" name="areaLng" placeholder="请输入地区经度" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区纬度</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaLat" placeholder="请输入地区纬度" class="layui-input">
+                        <input type="text" name="areaLat" placeholder="请输入地区纬度" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区拼音 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaPinyin" lay-verify="required" placeholder="请输入地区拼音" class="layui-input">
+                        <input type="text" name="areaPinyin" lay-verify="required" placeholder="请输入地区拼音" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区首字母 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaFirst" lay-verify="required" placeholder="地区首字母" class="layui-input">
+                        <input type="text" name="areaFirst" lay-verify="required" placeholder="地区首字母" class="layui-input" maxlength="255">
                     </div>
                 </div>
 
diff --git a/module-dictionary/src/main/resources/templates/area/update.html b/module-dictionary/src/main/resources/templates/area/update.html
index bdbff75f..b1a026f2 100644
--- a/module-dictionary/src/main/resources/templates/area/update.html
+++ b/module-dictionary/src/main/resources/templates/area/update.html
@@ -31,37 +31,37 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaName" lay-verify="required" placeholder="请输入地区名称" class="layui-input">
+                        <input type="text" name="areaName" lay-verify="required" placeholder="请输入地区名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区编码 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaCode" placeholder="请输入地区编码" class="layui-input">
+                        <input type="text" name="areaCode" placeholder="请输入地区编码" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">城市编码</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaCityCode" placeholder="请输入城市编码" class="layui-input">
+                        <input type="text" name="areaCityCode" placeholder="请输入城市编码" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">合并名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaMergerName" placeholder="请输入合并名称" class="layui-input">
+                        <input type="text" name="areaMergerName" placeholder="请输入合并名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区简称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaShortName" placeholder="请输入地区简称" class="layui-input">
+                        <input type="text" name="areaShortName" placeholder="请输入地区简称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">邮政编码 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaZipCode" placeholder="请输入邮政编码" class="layui-input">
+                        <input type="text" name="areaZipCode" placeholder="请输入邮政编码" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -79,25 +79,25 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区经度</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaLng" placeholder="请输入地区经度" class="layui-input">
+                        <input type="text" name="areaLng" placeholder="请输入地区经度" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区纬度</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaLat" placeholder="请输入地区纬度" class="layui-input">
+                        <input type="text" name="areaLat" placeholder="请输入地区纬度" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区拼音 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaPinyin" placeholder="请输入地区拼音" class="layui-input">
+                        <input type="text" name="areaPinyin" placeholder="请输入地区拼音" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">地区首字母 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="areaFirst" placeholder="地区首字母" class="layui-input">
+                        <input type="text" name="areaFirst" placeholder="地区首字母" class="layui-input" maxlength="255">
                     </div>
                 </div>
 
diff --git a/module-dictionary/src/main/resources/templates/data/save.html b/module-dictionary/src/main/resources/templates/data/save.html
index 5325c9bf..6eeeee66 100644
--- a/module-dictionary/src/main/resources/templates/data/save.html
+++ b/module-dictionary/src/main/resources/templates/data/save.html
@@ -31,13 +31,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">字典名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="dataName" lay-verify="required" placeholder="请输入字典名称" class="layui-input">
+                        <input type="text" name="dataName" lay-verify="required" placeholder="请输入字典名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">字典说明</label>
                     <div class="layui-input-block">
-                        <input type="text" name="dataSummary" placeholder="请输入字典说明" class="layui-input">
+                        <input type="text" name="dataSummary" placeholder="请输入字典说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/module-dictionary/src/main/resources/templates/data/update.html b/module-dictionary/src/main/resources/templates/data/update.html
index 4d4c69aa..e0b2c880 100644
--- a/module-dictionary/src/main/resources/templates/data/update.html
+++ b/module-dictionary/src/main/resources/templates/data/update.html
@@ -31,13 +31,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">字典名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="dataName" lay-verify="required" placeholder="请输入字典名称" class="layui-input">
+                        <input type="text" name="dataName" lay-verify="required" placeholder="请输入字典名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">字典说明</label>
                     <div class="layui-input-block">
-                        <input type="text" name="dataSummary" placeholder="请输入字典说明" class="layui-input">
+                        <input type="text" name="dataSummary" placeholder="请输入字典说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
diff --git a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java b/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java
index 623ea776..9d6cbd17 100644
--- a/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java
+++ b/module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java
@@ -23,14 +23,14 @@ public class PermissionVO {
     private String permissionType;
     @ApiModelProperty(name = "permissionUrl", value = "权限路径")
     private String permissionUrl;
-    @ApiModelProperty(name = "permissionClientId", value = "客户端")
-    private String permissionClientId;
+    @ApiModelProperty(name = "systemTag", value = "系统标识")
+    private String systemTag;
     @ApiModelProperty(name = "isPublic", value = "是否公共")
     @CheckNumberAnnotation(name = "是否公共", types = {"0", "1"})
     private Integer isPublic;
 
     public String getPermissionTitle() {
-        return permissionTitle == null ? "" : permissionTitle;
+        return permissionTitle == null ? "" : permissionTitle.trim();
     }
 
     public void setPermissionTitle(String permissionTitle) {
@@ -38,7 +38,7 @@ public class PermissionVO {
     }
 
     public String getPermissionType() {
-        return permissionType == null ? "" : permissionType;
+        return permissionType == null ? "" : permissionType.trim();
     }
 
     public void setPermissionType(String permissionType) {
@@ -46,23 +46,23 @@ public class PermissionVO {
     }
 
     public String getPermissionUrl() {
-        return permissionUrl == null ? "" : permissionUrl;
+        return permissionUrl == null ? "" : permissionUrl.trim();
     }
 
     public void setPermissionUrl(String permissionUrl) {
         this.permissionUrl = permissionUrl;
     }
 
-    public String getPermissionClientId() {
-        return permissionClientId == null ? "" : permissionClientId;
+    public String getSystemTag() {
+        return systemTag == null ? "" : systemTag.trim();
     }
 
-    public void setPermissionClientId(String permissionClientId) {
-        this.permissionClientId = permissionClientId;
+    public void setSystemTag(String systemTag) {
+        this.systemTag = systemTag;
     }
 
     public Integer getIsPublic() {
-        return isPublic == null ? 0 : isPublic;
+        return isPublic;
     }
 
     public void setIsPublic(Integer isPublic) {
@@ -78,8 +78,8 @@ public class PermissionVO {
                 .append(permissionType).append('\"');
         sb.append(",\"permissionUrl\":\"")
                 .append(permissionUrl).append('\"');
-        sb.append(",\"permissionClientId\":\"")
-                .append(permissionClientId).append('\"');
+        sb.append(",\"systemTag\":\"")
+                .append(systemTag).append('\"');
         sb.append(",\"isPublic\":")
                 .append(isPublic);
         sb.append('}');
diff --git a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml b/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
index 89672e51..9a21bd01 100644
--- a/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
+++ b/module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
@@ -9,8 +9,7 @@
         <result column="permission_title" property="permissionTitle"/>
         <result column="permission_type" property="permissionType"/>
         <result column="permission_url" property="permissionUrl"/>
-        <result column="permission_client_id" property="permissionClientId"/>
-        <result column="permission_client_name" property="permissionClientName"/>
+        <result column="system_tag" property="systemTag"/>
         <result column="is_public" property="isPublic"/>
     </resultMap>
 
@@ -42,7 +41,7 @@
             permission_title,
             permission_type,
             permission_url,
-            permission_client_id,
+            system_tag,
             is_public,
             creator,
             gmt_create,
@@ -54,7 +53,7 @@
             #{permissionTitle},
             #{permissionType},
             #{permissionUrl},
-            #{permissionClientId},
+            #{systemTag},
             #{isPublic},
             #{creator},
             #{gmtCreate},
@@ -104,8 +103,8 @@
         <if test="permissionUrl != null and permissionUrl != ''">
             permission_url = #{permissionUrl},
         </if>
-        <if test="permissionClientId != null and permissionClientId != ''">
-            permission_client_id = #{permissionClientId},
+        <if test="systemTag != null and systemTag != ''">
+            system_tag = #{systemTag},
         </if>
         <if test="isPublic != null">
             is_public = #{isPublic},
@@ -122,7 +121,7 @@
             t1.permission_title,
             t1.permission_type,
             t1.permission_url,
-            t1.permission_client_id,
+            t1.system_tag,
             t1.is_public,
             t1.permission_id
         FROM
@@ -141,7 +140,7 @@
             t1.permission_title,
             t1.permission_type,
             t1.permission_url,
-            t1.permission_client_id,
+            t1.system_tag,
             t1.is_public,
             t1.permission_id
         FROM
@@ -151,15 +150,17 @@
         <if test="keywords != null and keywords != ''">
         AND (
             t1.permission_title LIKE CONCAT('%', #{keywords}, '%')
+            OR
+            t1.system_tag LIKE CONCAT('%', #{keywords}, '%')
         )
         </if>
         <if test="permissionType != null and permissionType != ''">
         AND
             t1.permission_type = #{permissionType}
         </if>
-        <if test="permissionClientId != null and permissionClientId != ''">
+        <if test="systemTag != null and systemTag != ''">
         AND
-            t1.permission_client_id = #{permissionClientId}
+            t1.system_tag = #{systemTag}
         </if>
         <if test="isPublic != null">
         AND
diff --git a/module-permission/src/main/resources/templates/permission/list.html b/module-permission/src/main/resources/templates/permission/list.html
index 14d8d0d8..63e745fa 100644
--- a/module-permission/src/main/resources/templates/permission/list.html
+++ b/module-permission/src/main/resources/templates/permission/list.html
@@ -109,11 +109,11 @@
                                 return '错误';
                             }
                         },
-                        {field: 'permissionClientName', width: 180, title: '客户端名称', align:'center',
+                        {field: 'systemTag', width: 180, title: '系统标识', align:'center',
                             templet: function(row) {
                                 var rowData = row[this.field];
                                 if(typeof(rowData) === 'undefined' || rowData == null || rowData == '') {
-                                    return '-';
+                                    return '本系统';
                                 }
                                 return rowData;
                             }
diff --git a/module-permission/src/main/resources/templates/permission/save.html b/module-permission/src/main/resources/templates/permission/save.html
index 0c1f7423..eabb7f54 100644
--- a/module-permission/src/main/resources/templates/permission/save.html
+++ b/module-permission/src/main/resources/templates/permission/save.html
@@ -26,26 +26,20 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">权限名称</label>
                     <div class="layui-input-block">
-                        <input type="text" id="permissionTitle" name="permissionTitle" class="layui-input" value="" lay-verify="required" placeholder="请输入权限名称" >
+                        <input type="text" id="permissionTitle" name="permissionTitle" class="layui-input" value="" lay-verify="required" placeholder="请输入权限名称" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">权限路径</label>
                     <div class="layui-input-block">
-                        <input type="text" id="permissionUrl" name="permissionUrl" class="layui-input" value="" lay-verify="required" placeholder="请输入权限路径，以'/'开头，符合Ant风格的通配符，例如：/api/**" >
+                        <input type="text" id="permissionUrl" name="permissionUrl" class="layui-input" value="" lay-verify="required" placeholder="请输入权限路径，以'/'开头，符合Ant风格的通配符，例如：/api/**" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">客户端</label>
-                    <div class="layui-input-block layui-form" id="permissionClientIdSelectTemplateBox" lay-filter="permissionClientIdSelectTemplateBox"></div>
-                    <script id="permissionClientIdSelectTemplate" type="text/html">
-                        <select id="permissionClientId" name="permissionClientId">
-                            <option value="">请选择客户端</option>
-                            {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.clientId}}">{{item.clientName}}</option>
-                            {{# } }}
-                        </select>
-                    </script>
+                    <label class="layui-form-label">系统标识</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="systemTag" name="systemTag" class="layui-input" value="" placeholder="请输入系统标识" maxlength="255">
+                    </div>
                 </div>
                 <div class="layui-form-item" pane>
                     <label class="layui-form-label">公共接口</label>
diff --git a/module-permission/src/main/resources/templates/permission/update.html b/module-permission/src/main/resources/templates/permission/update.html
index 251addc5..ff1fab7a 100644
--- a/module-permission/src/main/resources/templates/permission/update.html
+++ b/module-permission/src/main/resources/templates/permission/update.html
@@ -26,26 +26,20 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">权限名称</label>
                     <div class="layui-input-block">
-                        <input type="text" id="permissionTitle" name="permissionTitle" class="layui-input" value="" lay-verify="required" placeholder="请输入权限名称" >
+                        <input type="text" id="permissionTitle" name="permissionTitle" class="layui-input" value="" lay-verify="required" placeholder="请输入权限名称" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">权限路径</label>
                     <div class="layui-input-block">
-                        <input type="text" id="permissionUrl" name="permissionUrl" class="layui-input" value="" lay-verify="required" placeholder="请输入权限路径，以'/'开头，符合Ant风格的通配符，例如：api/**" >
+                        <input type="text" id="permissionUrl" name="permissionUrl" class="layui-input" value="" lay-verify="required" placeholder="请输入权限路径，以'/'开头，符合Ant风格的通配符，例如：api/**" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
-                    <label class="layui-form-label">客户端</label>
-                    <div class="layui-input-block layui-form" id="permissionClientIdSelectTemplateBox" lay-filter="permissionClientIdSelectTemplateBox"></div>
-                    <script id="permissionClientIdSelectTemplate" type="text/html">
-                        <select id="permissionClientId" name="permissionClientId">
-                            <option value="">请选择客户端</option>
-                            {{# for(var i = 0, item; item = d[i++];) { }}
-                            <option value="{{item.clientId}}">{{item.clientName}}</option>
-                            {{# } }}
-                        </select>
-                    </script>
+                    <label class="layui-form-label">系统标识</label>
+                    <div class="layui-input-block">
+                        <input type="text" id="systemTag" name="systemTag" class="layui-input" value="" placeholder="请输入系统标识" maxlength="255">
+                    </div>
                 </div>
                 <div class="layui-form-item" pane>
                     <label class="layui-form-label">公共接口</label>
@@ -86,22 +80,6 @@
             parent.layer.close(parent.layer.getFrameIndex(window.name));
         }
 
-        // 初始化客户端下拉选择
-        function initPermissionClientIdSelect(selectValue) {
-            top.restAjax.get(top.restAjax.path('api/oauthclient/listoauthclient', []), {}, null, function(code, data, args) {
-                laytpl(document.getElementById('permissionClientIdSelectTemplate').innerHTML).render(data, function(html) {
-                    document.getElementById('permissionClientIdSelectTemplateBox').innerHTML = html;
-                });
-                form.render('select', 'permissionClientIdSelectTemplateBox');
-
-                var selectObj = {};
-                selectObj['permissionClientId'] = selectValue;
-                form.val('dataForm', selectObj);
-            }, function(code, data) {
-                top.dialog.msg(data.msg);
-            });
-        }
-
         function initPermissionType() {
             var permissionType = $('#permissionType').val();
             if(permissionType === 'permissionInsert') {
@@ -128,8 +106,6 @@
                 }
                 form.val('dataForm', dataFormData);
                 form.render(null, 'dataForm');
-
-                // initPermissionClientIdSelect(data['permissionClientId']);
                 initPermissionType();
             }, function(code, data) {
                 top.dialog.msg(data.msg);
diff --git a/service-department/src/main/resources/templates/department/save-merge.html b/service-department/src/main/resources/templates/department/save-merge.html
index 65d9d0fb..d65dbed3 100644
--- a/service-department/src/main/resources/templates/department/save-merge.html
+++ b/service-department/src/main/resources/templates/department/save-merge.html
@@ -32,7 +32,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(英文)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input">
+                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -42,7 +42,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(其他)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input">
+                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -50,7 +50,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织说明</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input">
+                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -94,7 +94,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真">
+                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -104,7 +104,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话">
+                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -112,7 +112,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责">
+                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -206,7 +206,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址">
+                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -322,8 +322,8 @@
         $(document).on('click', '#departmentMasterName', function() {
             top.dialog.dialogData.selectedUserIds = $('#departmentMaster').val();
             top.dialog.open({
-                url: top.restAjax.path('route/system/user/select-department-user.html', []),
-                title: '选择组织部门人员',
+                url: top.restAjax.path('route/department/user/select-user', []),
+                title: '选择用户',
                 width: '500px',
                 height: '500px',
                 onClose: function() {
diff --git a/service-department/src/main/resources/templates/department/save-split.html b/service-department/src/main/resources/templates/department/save-split.html
index 6f89d494..7aae367e 100644
--- a/service-department/src/main/resources/templates/department/save-split.html
+++ b/service-department/src/main/resources/templates/department/save-split.html
@@ -38,7 +38,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(英文)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input">
+                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -48,7 +48,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(其他)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input">
+                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -56,7 +56,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织说明</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input">
+                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -100,7 +100,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真">
+                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -110,7 +110,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话">
+                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -118,7 +118,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责">
+                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -212,7 +212,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址">
+                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -328,8 +328,8 @@
         $(document).on('click', '#departmentMasterName', function() {
             top.dialog.dialogData.selectedUserIds = $('#departmentMaster').val();
             top.dialog.open({
-                url: top.restAjax.path('route/system/user/select-department-user.html', []),
-                title: '选择组织部门人员',
+                url: top.restAjax.path('route/department/user/select-user', []),
+                title: '选择用户',
                 width: '500px',
                 height: '500px',
                 onClose: function() {
diff --git a/service-department/src/main/resources/templates/department/save.html b/service-department/src/main/resources/templates/department/save.html
index ea98a1f3..41483d12 100644
--- a/service-department/src/main/resources/templates/department/save.html
+++ b/service-department/src/main/resources/templates/department/save.html
@@ -49,7 +49,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(英文)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input">
+                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -57,7 +57,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(其他)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input">
+                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -67,7 +67,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织说明</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input">
+                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -221,7 +221,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址">
+                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -362,8 +362,8 @@
         $(document).on('click', '#departmentMasterName', function() {
             top.dialog.dialogData.selectedUserIds = $('#departmentMaster').val();
             top.dialog.open({
-                url: top.restAjax.path('route/system/user/select-department-user.html', []),
-                title: '选择组织部门人员',
+                url: top.restAjax.path('route/department/user/select-user', []),
+                title: '选择用户',
                 width: '500px',
                 height: '500px',
                 onClose: function() {
diff --git a/service-department/src/main/resources/templates/department/update-split.html b/service-department/src/main/resources/templates/department/update-split.html
index b10d6c22..af2e5571 100644
--- a/service-department/src/main/resources/templates/department/update-split.html
+++ b/service-department/src/main/resources/templates/department/update-split.html
@@ -38,7 +38,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(英文)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input">
+                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -48,7 +48,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(其他)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input">
+                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -56,7 +56,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织说明</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input">
+                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -100,7 +100,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真">
+                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -110,7 +110,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话">
+                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -118,7 +118,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责">
+                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -212,7 +212,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址">
+                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -395,8 +395,8 @@
         $(document).on('click', '#departmentMasterName', function() {
             top.dialog.dialogData.selectedUserIds = $('#departmentMaster').val();
             top.dialog.open({
-                url: top.restAjax.path('route/system/user/select-department-user.html', []),
-                title: '选择组织部门人员',
+                url: top.restAjax.path('route/department/user/select-user', []),
+                title: '选择用户',
                 width: '500px',
                 height: '500px',
                 onClose: function() {
diff --git a/service-department/src/main/resources/templates/department/update.html b/service-department/src/main/resources/templates/department/update.html
index e7efff66..7dcf9a96 100644
--- a/service-department/src/main/resources/templates/department/update.html
+++ b/service-department/src/main/resources/templates/department/update.html
@@ -49,7 +49,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(英文)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input">
+                                <input type="text" name="departmentNameEn" placeholder="请输入名称(英文)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -57,7 +57,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">名称(其他)</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input">
+                                <input type="text" name="departmentNameOther" placeholder="请输入名称(其他)" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -67,7 +67,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织说明</label>
                             <div class="layui-input-block">
-                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input">
+                                <input type="text" name="departmentSummary" placeholder="请输入组织说明" class="layui-input" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -111,7 +111,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织传真</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真">
+                                <input type="text" class="layui-input" name="departmentFax" placeholder="请输入组织传真" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -119,7 +119,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织电话</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话">
+                                <input type="text" class="layui-input" name="departmentTel" placeholder="请输入组织电话" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -129,7 +129,7 @@
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织职责</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责">
+                                <input type="text" class="layui-input" name="departmentDuty" placeholder="请输入组织职责" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -217,11 +217,11 @@
                             </script>
                         </div>
                     </div>
-                    <div th:class="${hasArea ? 'layui-col-md6 layui-col-sm6 layui-col-xs12' : 'layui-col-md12 layui-col-sm12 layui-col-xs12'}">
+                    <div class="layui-col-md6 layui-col-sm6 layui-col-xs12">
                         <div class="layui-form-item">
                             <label class="layui-form-label">组织地址</label>
                             <div class="layui-input-block">
-                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址">
+                                <input type="text" class="layui-input" name="departmentAddress" placeholder="请输入组织地址" maxlength="255">
                             </div>
                         </div>
                     </div>
@@ -404,8 +404,8 @@
         $(document).on('click', '#departmentMasterName', function() {
             top.dialog.dialogData.selectedUserIds = $('#departmentMaster').val();
             top.dialog.open({
-                url: top.restAjax.path('route/user/select-department-user.html', []),
-                title: '选择组织部门人员',
+                url: top.restAjax.path('route/department/user/select-user', []),
+                title: '选择用户',
                 width: '500px',
                 height: '500px',
                 onClose: function() {
diff --git a/service-group/src/main/resources/templates/group/save.html b/service-group/src/main/resources/templates/group/save.html
index cdb4a817..f5fffe11 100644
--- a/service-group/src/main/resources/templates/group/save.html
+++ b/service-group/src/main/resources/templates/group/save.html
@@ -31,13 +31,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">组名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="groupName" lay-verify="required" placeholder="请输入组名称" class="layui-input">
+                        <input type="text" name="groupName" lay-verify="required" placeholder="请输入组名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">组说明</label>
                     <div class="layui-input-block">
-                        <input type="text" name="groupSummary" placeholder="请输入组说明" class="layui-input">
+                        <input type="text" name="groupSummary" placeholder="请输入组说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
 
diff --git a/service-group/src/main/resources/templates/group/update.html b/service-group/src/main/resources/templates/group/update.html
index ee72910a..fd8a7605 100644
--- a/service-group/src/main/resources/templates/group/update.html
+++ b/service-group/src/main/resources/templates/group/update.html
@@ -31,13 +31,13 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">组名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="groupName" lay-verify="required" placeholder="请输入组名称" class="layui-input">
+                        <input type="text" name="groupName" lay-verify="required" placeholder="请输入组名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">组说明</label>
                     <div class="layui-input-block">
-                        <input type="text" name="groupSummary" placeholder="请输入组说明" class="layui-input">
+                        <input type="text" name="groupSummary" placeholder="请输入组说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
 
diff --git a/service-menu/src/main/resources/templates/menu/save.html b/service-menu/src/main/resources/templates/menu/save.html
index 5b0705c6..fc14daa9 100644
--- a/service-menu/src/main/resources/templates/menu/save.html
+++ b/service-menu/src/main/resources/templates/menu/save.html
@@ -31,19 +31,19 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">菜单名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="menuName" lay-verify="required"  placeholder="请输入菜单名称" class="layui-input">
+                        <input type="text" name="menuName" lay-verify="required"  placeholder="请输入菜单名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">菜单说明 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="menuSummary" lay-verify="required"  placeholder="请输入菜单说明" class="layui-input">
+                        <input type="text" name="menuSummary" lay-verify="required"  placeholder="请输入菜单说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">链接 *</label>
                     <div class="layui-input-block">
-                        <input id="menuUrl" type="text" name="menuUrl" lay-verify="required"  placeholder="请输入菜单链接" class="layui-input" value="javascript:void(0);">
+                        <input id="menuUrl" type="text" name="menuUrl" lay-verify="required"  placeholder="请输入菜单链接" class="layui-input" value="javascript:void(0);" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -84,7 +84,7 @@
                         <div id="openIcon" style="cursor: pointer; font-size: 30px;">
                             <i id="menuIconLogo" class="fa fa-list" style="margin: 4px 0 0 15px;"></i>
                         </div>
-                        <input type="hidden" class="form-control" id="menuIcon" name="menuIcon" value="fa fa-list">
+                        <input type="hidden" class="form-control" id="menuIcon" name="menuIcon" value="fa fa-list" maxlength="255">
                     </div>
                 </div>
 
diff --git a/service-menu/src/main/resources/templates/menu/update.html b/service-menu/src/main/resources/templates/menu/update.html
index a1529e8d..68bb7d1e 100644
--- a/service-menu/src/main/resources/templates/menu/update.html
+++ b/service-menu/src/main/resources/templates/menu/update.html
@@ -31,19 +31,19 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">菜单名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="menuName" lay-verify="required"  placeholder="请输入菜单名称" class="layui-input">
+                        <input type="text" name="menuName" lay-verify="required"  placeholder="请输入菜单名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">菜单说明 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="menuSummary" lay-verify="required"  placeholder="请输入菜单说明" class="layui-input">
+                        <input type="text" name="menuSummary" lay-verify="required"  placeholder="请输入菜单说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">链接 *</label>
                     <div class="layui-input-block">
-                        <input id="menuUrl" type="text" name="menuUrl" lay-verify="required"  placeholder="请输入菜单链接" class="layui-input" value="javascript:void(0);">
+                        <input id="menuUrl" type="text" name="menuUrl" lay-verify="required"  placeholder="请输入菜单链接" class="layui-input" value="javascript:void(0);" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
@@ -84,7 +84,7 @@
                         <div id="openIcon" style="cursor: pointer; font-size: 30px;">
                             <i id="menuIconLogo" class="fa fa-list" style="margin: 4px 0 0 15px;"></i>
                         </div>
-                        <input type="hidden" class="form-control" id="menuIcon" name="menuIcon" value="fa fa-list">
+                        <input type="hidden" class="form-control" id="menuIcon" name="menuIcon" value="fa fa-list" maxlength="255">
                     </div>
                 </div>
 
diff --git a/service-position/src/main/resources/templates/position/save.html b/service-position/src/main/resources/templates/position/save.html
index 2dd2e0cb..fc310580 100644
--- a/service-position/src/main/resources/templates/position/save.html
+++ b/service-position/src/main/resources/templates/position/save.html
@@ -31,19 +31,19 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">职位名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="positionName" lay-verify="required" placeholder="请输入职位名称" class="layui-input">
+                        <input type="text" name="positionName" lay-verify="required" placeholder="请输入职位名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">职位说明</label>
                     <div class="layui-input-block">
-                        <input type="text" name="positionSummary" placeholder="请输入职位说明" class="layui-input">
+                        <input type="text" name="positionSummary" placeholder="请输入职位说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">英文名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="positionNameEn" placeholder="请输入英文名称" class="layui-input">
+                        <input type="text" name="positionNameEn" placeholder="请输入英文名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
 
diff --git a/service-position/src/main/resources/templates/position/update.html b/service-position/src/main/resources/templates/position/update.html
index d655416a..05bb5265 100644
--- a/service-position/src/main/resources/templates/position/update.html
+++ b/service-position/src/main/resources/templates/position/update.html
@@ -31,19 +31,19 @@
                 <div class="layui-form-item">
                     <label class="layui-form-label">职位名称 *</label>
                     <div class="layui-input-block">
-                        <input type="text" name="positionName" lay-verify="required" placeholder="请输入职位名称" class="layui-input">
+                        <input type="text" name="positionName" lay-verify="required" placeholder="请输入职位名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">职位说明</label>
                     <div class="layui-input-block">
-                        <input type="text" name="positionSummary" placeholder="请输入职位说明" class="layui-input">
+                        <input type="text" name="positionSummary" placeholder="请输入职位说明" class="layui-input" maxlength="255">
                     </div>
                 </div>
                 <div class="layui-form-item">
                     <label class="layui-form-label">英文名称</label>
                     <div class="layui-input-block">
-                        <input type="text" name="positionNameEn" placeholder="请输入英文名称" class="layui-input">
+                        <input type="text" name="positionNameEn" placeholder="请输入英文名称" class="layui-input" maxlength="255">
                     </div>
                 </div>
 
diff --git a/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java b/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java
index 68d22a82..f7c03b44 100644
--- a/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java
+++ b/service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java
@@ -69,8 +69,8 @@ public class RolePermissionServiceImpl extends DefaultBaseService implements IRo
         rolePermissionDTO.setPermissionTitle(permissionDTO.getPermissionTitle());
         rolePermissionDTO.setPermissionType(permissionDTO.getPermissionType());
         rolePermissionDTO.setPermissionUrl(permissionDTO.getPermissionUrl());
-        rolePermissionDTO.setPermissionClientId(permissionDTO.getPermissionClientId());
-        rolePermissionDTO.setPermissionClientName(permissionDTO.getPermissionClientName());
+//        rolePermissionDTO.setPermissionClientId(permissionDTO.getPermissionClientId());
+//        rolePermissionDTO.setPermissionClientName(permissionDTO.getPermissionClientName());
         rolePermissionDTO.setIsPublic(permissionDTO.getIsPublic());
         return rolePermissionDTO;
     }
@@ -98,8 +98,8 @@ public class RolePermissionServiceImpl extends DefaultBaseService implements IRo
                     rolePermissionDTO.setPermissionTitle(permissionDTO.getPermissionTitle());
                     rolePermissionDTO.setPermissionType(permissionDTO.getPermissionType());
                     rolePermissionDTO.setPermissionUrl(permissionDTO.getPermissionUrl());
-                    rolePermissionDTO.setPermissionClientId(permissionDTO.getPermissionClientId());
-                    rolePermissionDTO.setPermissionClientName(permissionDTO.getPermissionClientName());
+//                    rolePermissionDTO.setPermissionClientId(permissionDTO.getPermissionClientId());
+//                    rolePermissionDTO.setPermissionClientName(permissionDTO.getPermissionClientName());
                     rolePermissionDTO.setIsPublic(permissionDTO.getIsPublic());
                     break;
                 }