Tenlion/wg-basic
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

完善表单字段长度

Browse Source
This commit is contained in:
WenG 2021-02-17 21:06:29 +08:00
parent 57443e5825
commit fe4ea75b5a
22 changed files with 146 additions and 188 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

53
basic-pojo/src/main/java/ink/wgink/pojo/dtos/permission/PermissionDTO.java
View File

@ -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('}');

20
module-dictionary/src/main/resources/templates/area/save.html
View File

@ -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>

20
module-dictionary/src/main/resources/templates/area/update.html
View File

@ -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>

4
module-dictionary/src/main/resources/templates/data/save.html
View File

@ -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">

4
module-dictionary/src/main/resources/templates/data/update.html
View File

@ -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">

24
module-permission/src/main/java/ink/wgink/module/permission/pojo/vos/PermissionVO.java
View File

@ -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('}');

21
module-permission/src/main/resources/mybatis/mapper/permission-mapper.xml
View File

@ -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

4
module-permission/src/main/resources/templates/permission/list.html
View File

@ -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;
}

18
module-permission/src/main/resources/templates/permission/save.html
View File

@ -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>

36
module-permission/src/main/resources/templates/permission/update.html
View File

@ -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);

18
service-department/src/main/resources/templates/department/save-merge.html
View File

@ -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() {

18
service-department/src/main/resources/templates/department/save-split.html
View File

@ -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() {

12
service-department/src/main/resources/templates/department/save.html
View File

@ -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() {

18
service-department/src/main/resources/templates/department/update-split.html
View File

@ -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() {

20
service-department/src/main/resources/templates/department/update.html
View File

@ -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() {

4
service-group/src/main/resources/templates/group/save.html
View File

@ -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>

4
service-group/src/main/resources/templates/group/update.html
View File

@ -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>

8
service-menu/src/main/resources/templates/menu/save.html
View File

@ -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>

8
service-menu/src/main/resources/templates/menu/update.html
View File

@ -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>

6
service-position/src/main/resources/templates/position/save.html
View File

@ -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>

6
service-position/src/main/resources/templates/position/update.html
View File

@ -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>

8
service-role/src/main/java/ink/wgink/service/role/service/impl/RolePermissionServiceImpl.java
View File

@ -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;
}