shenhao 4 years ago
parent
commit
c7203b126b

+ 3 - 3
src/main/resources/mybatis/mapper/CuratorMapper.xml

@@ -423,9 +423,9 @@
         <if test="searchValue != '' ">
             and t12.child_name regexp #{searchValue}
         </if>
-        <if test="searchSubject != '' ">
-            and a.SUBJECT  = #{searchSubject}
-        </if>
+<!--        <if test="searchSubject != '' ">-->
+<!--            and a.SUBJECT  = #{searchSubject}-->
+<!--        </if>-->
         ) a
         GROUP BY
         a.create_time,

BIN
src/main/resources/static/sys/excel/order.xlsx


+ 2 - 2
src/main/resources/templates/sys/order/vipOrderList.html

@@ -70,7 +70,7 @@
 			<input type="button" id="button" style="width: 100px;" class="scbtnbution" value="导出订单明细" />
 		</li>
 		<li th:if="${ #httpSession.getAttribute('admin') !=null  &&  #lists.contains(#httpSession.getAttribute('admin').orgcodeList,'SSJ-SSJ-CW') }">
-			<input type="button" id="principalimput" style="width: 100px;height: 30px"  class="scbtn" value=" + 导入校长" />
+			<input type="button" id="principalimput" style="width: 100px;height: 30px"  class="scbtn" value=" + 导入失效名单" />
 			<div style="display: none">
 				<input type="file" accept="application/vnd.openxmlformats-officedocument.spreadsheetml.sheet" id="principalfile" />
 			</div>
@@ -245,7 +245,7 @@ function filePrincipalLoad(ele){
 	formData.append("file", files);
 	formData.append("name", name);
 	$.ajax({
-		url: "[[${sysUrl}]]/sys/imlibuser/principal/import",
+		url: "[[${sysUrl}]]/sys/order/principal/import",
 		type: 'POST',
 		data: formData,
 		processData: false,