1.系统业务管理列表增加serviceId搜索条件
2.修复修改业务时serviceId会自动获取新值的问题(serviceId是不允许修改的)
This commit is contained in:
@@ -41,6 +41,9 @@
|
|||||||
<if test="serviceName != null and serviceName != ''">
|
<if test="serviceName != null and serviceName != ''">
|
||||||
and ssi.service_name like CONCAT('%', #{serviceName}, '%')
|
and ssi.service_name like CONCAT('%', #{serviceName}, '%')
|
||||||
</if>
|
</if>
|
||||||
|
<if test="serviceId != null and serviceId != ''">
|
||||||
|
and ssi.service_id like CONCAT('%', #{serviceId}, '%')
|
||||||
|
</if>
|
||||||
<if test="action != null">
|
<if test="action != null">
|
||||||
and ssi.action=#{action}
|
and ssi.action=#{action}
|
||||||
</if>
|
</if>
|
||||||
|
|||||||
@@ -116,6 +116,9 @@
|
|||||||
|
|
||||||
//自动获取serviceId
|
//自动获取serviceId
|
||||||
function autoServiceId() {
|
function autoServiceId() {
|
||||||
|
if ("${systemServiceInfo.id}") {
|
||||||
|
return false;
|
||||||
|
}
|
||||||
var type = $("[name=tableType]").val();
|
var type = $("[name=tableType]").val();
|
||||||
var action = $("#action").val();
|
var action = $("#action").val();
|
||||||
var serviceIdPre;
|
var serviceIdPre;
|
||||||
@@ -315,7 +318,6 @@
|
|||||||
<div class="row">
|
<div class="row">
|
||||||
<div class="col-md-offset-3 col-md-9">
|
<div class="col-md-offset-3 col-md-9">
|
||||||
<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value="保存"/></shiro:hasPermission>
|
<shiro:hasPermission name="system:service:edit"><input type="submit" class="btn btn-circle blue" value="保存"/></shiro:hasPermission>
|
||||||
<%-- <shiro:hasPermission name="system:service:edit"><button type="submit" class="btn btn-circle blue">保存</button></shiro:hasPermission> --%>
|
|
||||||
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">取消</button>
|
<button type="button" class="btn btn-circle grey-salsa btn-outline" onclick="history.go(-1)">取消</button>
|
||||||
</div>
|
</div>
|
||||||
</div>
|
</div>
|
||||||
|
|||||||
@@ -79,10 +79,15 @@ function deleteService(id) {
|
|||||||
</span>
|
</span>
|
||||||
|
|
||||||
<span class="search-item">
|
<span class="search-item">
|
||||||
<span>名称 :</span>
|
<span>业务名称 :</span>
|
||||||
<form:input path="serviceName" htmlEscape="false" class="input-small"/>
|
<form:input path="serviceName" htmlEscape="false" class="input-small"/>
|
||||||
</span>
|
</span>
|
||||||
|
|
||||||
|
<span class="search-item">
|
||||||
|
<span>业务ID :</span>
|
||||||
|
<form:input path="serviceId" htmlEscape="false" class="input-small"/>
|
||||||
|
</span>
|
||||||
|
|
||||||
<span class="search-item">
|
<span class="search-item">
|
||||||
<button type="submit" onclick="return page();" class="btn btn-default btn-sm">
|
<button type="submit" onclick="return page();" class="btn btn-default btn-sm">
|
||||||
<i class="fa fa-edit"></i> 搜索
|
<i class="fa fa-edit"></i> 搜索
|
||||||
|
|||||||
Reference in New Issue
Block a user