Просмотр исходного кода

公共头部修改,智政修改,成果需求修改

liliang4869 лет назад: 7
Родитель
Сommit
c35830b502

+ 6 - 6
src/main/java/com/goafanti/achievement/controller/UserAchievementApiController.java

@@ -232,12 +232,12 @@ public class UserAchievementApiController extends CertifyApiController {
 			return res;
 		}
 
-		if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
-				&& !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
-				&& !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
-			return res;
-		}
+//		if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
+//				&& !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
+//				&& !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
+//			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
+//			return res;
+//		}
 		List<String> webPages = new ArrayList<String>();
 		List<String> appPages = new ArrayList<String>();
 		PageConstants.putAchievement(publishPages, webPages, appPages);

+ 6 - 6
src/main/java/com/goafanti/demand/controller/UserDemandApiController.java

@@ -185,12 +185,12 @@ public class UserDemandApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
 			return res;
 		}
-		if (!DemandAuditStatus.CREATE.getCode().equals(demand.getAuditStatus())
-				&& !DemandAuditStatus.UNAUDITED.getCode().equals(demand.getAuditStatus())
-				&& !DemandAuditStatus.REVOKE.getCode().equals(demand.getAuditStatus())) {
-			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
-			return res;
-		}
+//		if (!DemandAuditStatus.CREATE.getCode().equals(demand.getAuditStatus())
+//				&& !DemandAuditStatus.UNAUDITED.getCode().equals(demand.getAuditStatus())
+//				&& !DemandAuditStatus.REVOKE.getCode().equals(demand.getAuditStatus())) {
+//			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "当前状态无法提交审核!"));
+//			return res;
+//		}
 		//demand.setAuditStatus(DemandAuditStatus.INAUDIT.getCode()); 两步操作,先保存后提交
 		res = disposeDemand(res, demand, keywords, publishPages);
 		if (!res.getError().isEmpty()) {

+ 1 - 1
src/main/webapp/WEB-INF/views/common.html

@@ -20,7 +20,7 @@
 	 <div class="header">
         <div class="container">
             <div>
-                <a href="#">网站导航</a>
+      
             </div>
            <div>
 				<ul>

+ 1 - 1
src/main/webapp/WEB-INF/views/portal/thinkTank/index.html

@@ -4,7 +4,7 @@
 <head th:replace="common::header(~{::title},~{::link})">
 	<title>智库咨询--我的技术和科技服务交易平台</title>
 	<link th:href="${portalHost + '/vendors.css'}" rel="stylesheet">
-	<link th:href="${portalHost + '/thinkTank/policyList.css'}" rel="stylesheet">
+	<link th:href="${portalHost + '/thinkTank.css'}" rel="stylesheet">
 </head>
 
 <body>