Browse Source

Merge remote-tracking branch 'origin/test' into patch

anderx 7 years ago
parent
commit
8831a4ff7f

+ 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 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -425,6 +425,7 @@ public class AdminApiController extends CertifyApiController {
 				return res;
 			}
 			identity.setAuditStatus(3);
+			identity.setAuditInfo("");
 			res.setData(userIdentityService.updateAuditing(identity));
 			return res;
 		}

+ 6 - 2
src/main/java/com/goafanti/common/controller/PublicController.java

@@ -759,8 +759,12 @@ public class PublicController extends BaseController {
 		Result res = new Result();
 		Pagination<JtBusinessProjectResult> pagination=jtBusinessService.getProjects(null,null, null, null, pageSize, pageNo, 0, 2, null, null, 0, 0, uid);
 		List<JtBusinessProjectResult> list=(List<JtBusinessProjectResult>) pagination.getList();
-		for (JtBusinessProjectResult j : list) {
-			j.setIntroduce(j.getIntroduce().replaceAll("\\<.*?>", ""));
+		if (list!=null ) {
+			for (JtBusinessProjectResult j : list) {
+				if (j!=null&&j.getIntroduce()!=null) {
+					j.setIntroduce(j.getIntroduce().replaceAll("\\<.*?>", ""));
+				}
+			}
 		}
 		res.setData(pagination);
 		return res;

+ 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;
 		}

+ 3 - 2
src/main/webapp/WEB-INF/views/portal/facilitator.html

@@ -24,8 +24,9 @@
     		</div>
     	</div>
     	<div class="facTab">
-    		<span class="facActive">首页</span>
-    		<span>所有项目</span>
+    		<span class="facActive">所有项目</span>
+    		<span>主页</span>
+    		
     	</div>
     	<div class="facFirst">
     		<div class="jianjie">