Merge branch 'bugfix-20190127-import-letter' into 'develop'
1.业务配置-导入摸板修改 来函下拉框显示内容(改为只显示通过的来函) See merge request K18_NTCS_WEB/NTC!27
This commit is contained in:
@@ -254,6 +254,7 @@
|
||||
select
|
||||
<include refid="Base_Column_List" />
|
||||
from request_info
|
||||
where is_audit in(1,3)
|
||||
</select>
|
||||
|
||||
<select id="findAllLwhhList" resultMap="BaseResultMap">
|
||||
|
||||
@@ -133,7 +133,7 @@
|
||||
<select name="requestId" data-live-search="true" data-live-search-placeholder="search" class="selectpicker form-control required">
|
||||
<%-- <option value=""><spring:message code="select"/></option> --%>
|
||||
<c:forEach items="${requestInfos}" var="requestInfo" varStatus="status">
|
||||
<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit!=3}">
|
||||
<c:if test="${requestInfo.isValid!=0 and requestInfo.isAudit ==1}">
|
||||
<option value="${requestInfo.id}"
|
||||
<c:if test="${status.index==0 }">selected</c:if>>${requestInfo.requestTitle}</option>
|
||||
</c:if>
|
||||
|
||||
Reference in New Issue
Block a user