Browse Source

Accept Merge Request #196 mg : (test -> master)

Merge Request: mg
Created By: @Antiloveg
Accepted By: @Antiloveg
URL: https://coding.net/t/aft/p/AFT/git/merge/196
Antiloveg 8 years ago
parent
commit
d8223b299f

+ 8 - 0
src/main/java/com/goafanti/demand/service/impl/DemandServiceImpl.java

@@ -117,6 +117,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(employerName)){
 			params.put("employerName", employerName);
 		}
+		
+		if (StringUtils.isNotBlank(username)){
+			params.put("username", username);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageUserDemandListByPage", "findManageUserDemandCount",
 				params, pNo, pSize);
@@ -156,6 +160,10 @@ public class DemandServiceImpl extends BaseMybatisDao<DemandMapper> implements D
 		if (StringUtils.isNotBlank(employerName)){
 			params.put("employerName", employerName);
 		}
+		
+		if (StringUtils.isNotBlank(username)){
+			params.put("unitName", username);
+		}
 
 		return (Pagination<DemandManageListBo>) findPage("findManageOrgDemandListByPage", "findManageOrgDemandCount",
 				params, pNo, pSize);

+ 16 - 0
src/main/webapp/WEB-INF/views/admin/idea.html

@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml"
+	xmlns:th="http://www.thymeleaf.org">
+<head th:replace="common::header(~{::title},~{::link})">
+	<title>科技思想页</title>
+	<link th:href="${staticHost+'/admin/idea.css'}" rel="stylesheet">
+</head>
+<body>
+	<div id="root"></div>
+	
+	<div th:replace="common::footer(~{::script})">
+		<script type="text/javascript" th:src="${staticHost+'/vendors.js'}"></script>
+		<script type="text/javascript" th:src="${staticHost+'/admin/idea.js'}"></script>
+	</div>
+</body>
+</html>