Antiloveg лет назад: 8
Родитель
Сommit
a9d34472ca

+ 5 - 0
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -2301,6 +2301,11 @@ public class AdminApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (StringUtils.isBlank(orgTechCenter.getCenterName())){
+			res.getError().add(buildError(ErrorConstants.DATA_EMPTY_ERROR, "", "研发部门名称"));
+			return res;
+		}
 
 		if (!checkCertify(res, orgTechCenter.getUid()).getError().isEmpty()) {
 			return res;

+ 5 - 0
src/main/java/com/goafanti/cognizance/controller/CognizanceApiController.java

@@ -2150,6 +2150,11 @@ public class CognizanceApiController extends CertifyApiController {
 		if (!checkCertify(res, curUser)) {
 			return res;
 		}
+		
+		if (StringUtils.isBlank(orgTechCenter.getCenterName())){
+			res.getError().add(buildError(ErrorConstants.DATA_EMPTY_ERROR, "", "研发部门名称"));
+			return res;
+		}
 
 		if (!StringUtils.isBlank(foundingTimeFormattedDate)) {
 			try {

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

@@ -118,7 +118,7 @@ public class PublicController extends BaseController {
 
 		if (!sign) {
 			if (StringUtils.isBlank(verificationCode)) {
-				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "验证码"));
+				res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "图形验证码"));
 				return res;
 			}
 			if (!TokenManager.getSession().getAttribute(VerifyCodeUtils.V_CODE).equals(verificationCode)) {

+ 2 - 1
src/main/java/com/goafanti/common/dao/ContractMapper.java

@@ -1,6 +1,7 @@
 package com.goafanti.common.dao;
 
 import java.util.List;
+import java.util.Map;
 
 import org.apache.ibatis.annotations.Param;
 
@@ -29,5 +30,5 @@ public interface ContractMapper {
 
 	Contract findByUidAndYear(@Param("uid") String uid, @Param("year")Integer year);
 
-	Integer findLatelyRecordByUid(String uid);
+	Contract findLatelyRecordByUid(String uid);
 }

+ 4 - 3
src/main/java/com/goafanti/contract/controller/ContractApiController.java

@@ -3,6 +3,7 @@ package com.goafanti.contract.controller;
 import java.util.Arrays;
 import java.util.Iterator;
 import java.util.List;
+import java.util.Map;
 
 import javax.annotation.Resource;
 import javax.validation.Valid;
@@ -262,11 +263,11 @@ public class ContractApiController extends CertifyApiController {
 			return res;
 		}
 
-		Integer cYear = contractService.findLatelyRecordByUid(uid);
+		Contract c = contractService.findLatelyRecordByUid(uid);
 		
-		if (null != cYear) {
+		/*if (null != cYear) {
 			res.getError().add(buildError("", "当前年份已有合同申请,无法提交新申请!"));
-		}
+		}*/
 		return res;
 	}
 }

+ 2 - 1
src/main/java/com/goafanti/contract/service/ContractService.java

@@ -1,6 +1,7 @@
 package com.goafanti.contract.service;
 
 import java.util.List;
+import java.util.Map;
 
 import com.goafanti.common.model.Contract;
 import com.goafanti.contract.bo.ContractClientListBo;
@@ -41,6 +42,6 @@ public interface ContractService {
 
 	Contract findByUidAndYear(String uid, Integer year);
 
-	Integer findLatelyRecordByUid(String uid);
+	Contract findLatelyRecordByUid(String uid);
 
 }

+ 1 - 1
src/main/java/com/goafanti/contract/service/impl/ContractServiceImpl.java

@@ -390,7 +390,7 @@ public class ContractServiceImpl extends BaseMybatisDao<ContractMapper> implemen
 	}
 
 	@Override
-	public Integer findLatelyRecordByUid(String uid) {
+	public Contract findLatelyRecordByUid(String uid) {
 		return contractMapper.findLatelyRecordByUid(uid);
 	}