Browse Source

成果需求审核BUG修复

anderx 7 years ago
parent
commit
126f38564b

+ 1 - 1
src/main/java/com/goafanti/achievement/controller/AdminAchievementApiController.java

@@ -90,7 +90,7 @@ public class AdminAchievementApiController extends CertifyApiController {
     	if(achievementResultObject==null) {
     		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"未找到成果","成果Id"));return result;
     	}
-    	if(achievementResultObject.getAuditStatus()!= AchievementAuditStatus.SUBMIT.getCode()||achievementResultObject.getAuditStatus()!= AchievementAuditStatus.AUDITED.getCode()) {
+    	if(achievementResultObject.getAuditStatus()!= AchievementAuditStatus.SUBMIT.getCode()) {
     		result.getError().add(buildError(ErrorConstants.PARAM_ERROR,"未找到成果","当前状态不可审核"));return result;
     	}
     	achievementService.updateAuditAchievement( id,auditResult,auditInfo);

+ 1 - 1
src/main/java/com/goafanti/demand/controller/AdminDemandApiController.java

@@ -153,7 +153,7 @@ public class AdminDemandApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求ID"));
 			return res;
 		}
-		if(d.getAuditStatus() != DemandAuditStatus.INAUDIT.getCode()||d.getAuditStatus() != DemandAuditStatus.AUDITED.getCode()){
+		if(d.getAuditStatus() != DemandAuditStatus.INAUDIT.getCode()){
 			res.getError().add(buildError(ErrorConstants.PARAM_ERROR, "", "需求未达审核条件"));
 			return res;
 		}

+ 0 - 1
src/main/webapp/WEB-INF/views/portal/facilitator.html

@@ -15,7 +15,6 @@
     <div th:replace="common::nav('','index')"></div>
     <!--主体部分-->
     <div id="facili" >
-    	<input type="hidden" th:value="${portalHost}" />
     	<div class="facImg">
     		<div>
     			<div><img th:src="${org.companyLogoUrl}==null or ${org.companyLogoUrl}==''?${portalHost+'/img/fac/fea1.png'}:${avatarUploadHost+org.companyLogoUrl}" alt=""></div>