Antiloveg vor 8 Jahren
Ursprung
Commit
efe44758c0

+ 15 - 20
src/main/java/com/goafanti/achievement/bo/AchievementListBo.java

@@ -36,11 +36,11 @@ public class AchievementListBo {
 	 * 类型(0--专利, 2--软著, 3--项目, 4--版权, 5--工业设计, 6--配方, 7--非标)
 	 */
 	private Integer	category;
-	
+
 	/**
 	 * 成果所有人ID
 	 */
-	private String ownerId;
+	private String	ownerId;
 
 	/**
 	 * 成果所有人名称
@@ -52,38 +52,36 @@ public class AchievementListBo {
 	 */
 	private Integer	ownerType;
 
-
-
 	/**
 	 * 发布时间
 	 */
 	private Date	releaseDate;
-	
+
 	/**
 	 * 审核状态
 	 */
-	private Integer auditStatus;
-	
+	private Integer	auditStatus;
+
 	/**
 	 * 技术经纪人
 	 */
-	private String techBrokerId;
-	
+	private String	techBrokerId;
+
 	/**
 	 * 认证所有人名称
 	 */
-	private String username;
-	
+	private String	username;
+
 	/**
 	 * 所属组织ID
 	 */
-	private String orgId;
-	
+	private String	orgId;
+
 	/**
 	 * 所属组织联系方式
 	 */
-	private Integer contacts;
-	
+	private Integer	contacts;
+
 	public String getOrgId() {
 		return orgId;
 	}
@@ -91,7 +89,7 @@ public class AchievementListBo {
 	public void setOrgId(String orgId) {
 		this.orgId = orgId;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getContacts() {
 		return contacts;
@@ -176,7 +174,6 @@ public class AchievementListBo {
 		this.ownerType = ownerType;
 	}
 
-
 	public Date getReleaseDate() {
 		return releaseDate;
 	}
@@ -184,7 +181,7 @@ public class AchievementListBo {
 	public void setReleaseDate(Date releaseDate) {
 		this.releaseDate = releaseDate;
 	}
-	
+
 	@JsonFormat(shape = Shape.STRING)
 	public Integer getAuditStatus() {
 		return auditStatus;
@@ -201,8 +198,6 @@ public class AchievementListBo {
 	public void setTechBrokerId(String techBrokerId) {
 		this.techBrokerId = techBrokerId;
 	}
-	
-	
 
 	public String getOwnerId() {
 		return ownerId;

+ 14 - 6
src/main/java/com/goafanti/admin/controller/AdminAchievementApiController.java

@@ -168,6 +168,11 @@ public class AdminAchievementApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(ia.getOwnerId()) && StringUtils.isBlank(ia.getOwnerName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人", "成果所有人"));
+			return res;
+		}
+
 		res = disposeInputAchievement(res, ia, keywords);
 		if (!res.getError().isEmpty()) {
 			return res;
@@ -197,6 +202,11 @@ public class AdminAchievementApiController extends CertifyApiController {
 			return res;
 		}
 
+		if (StringUtils.isBlank(ia.getOwnerId()) && StringUtils.isBlank(ia.getOwnerName())) {
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到成果所有人", "成果所有人"));
+			return res;
+		}
+
 		if (!AchievementAuditStatus.CREATE.getCode().equals(ia.getAuditStatus())
 				&& !AchievementAuditStatus.SUBMIT.getCode().equals(ia.getAuditStatus())
 				&& !AchievementAuditStatus.UNAUDITED.getCode().equals(ia.getAuditStatus())) {
@@ -483,8 +493,6 @@ public class AdminAchievementApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合作方式", "合作方式"));
 			return res;
 		}
-		
-		
 
 		for (int i = 0; i < keywords.length; i++) {
 			if (AFTConstants.KEYWORDLENTH < keywords[i].length()) {
@@ -587,10 +595,10 @@ public class AdminAchievementApiController extends CertifyApiController {
 						AchievementImportFields.COOPERATIONMODE.getDesc()));
 				return res;
 			}
-			
-			if (bo.getIntroduction().length() > 298){
-				res.getError().add(
-						buildError(ErrorConstants.PARAM_SIZE_ERROR, "", AchievementImportFields.INTRODUCTION.getDesc()));
+
+			if (bo.getIntroduction().length() > 298) {
+				res.getError().add(buildError(ErrorConstants.PARAM_SIZE_ERROR, "",
+						AchievementImportFields.INTRODUCTION.getDesc()));
 				return res;
 			}
 

+ 10 - 0
src/main/java/com/goafanti/admin/controller/AdminDemandApiController.java

@@ -245,6 +245,11 @@ public class AdminDemandApiController extends CertifyApiController {
 					DemandFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(demand.getEmployerId()) && StringUtils.isBlank(demand.getEmployerName())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求雇主", "需求雇主"));
+			return res;
+		}
 
 		res = disposeDemand(res, demand, keywords);
 		if (!res.getError().isEmpty()) {
@@ -371,6 +376,11 @@ public class AdminDemandApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求ID", "需求ID"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(demand.getEmployerId()) && StringUtils.isBlank(demand.getEmployerName())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到需求雇主", "需求雇主"));
+			return res;
+		}
 
 		if (!DemandAuditStatus.CREATE.getCode().equals(demand.getAuditStatus())
 				&& !DemandAuditStatus.SUBMIT.getCode().equals(demand.getAuditStatus())