Antiloveg 8 years ago
parent
commit
e192fe0c64

+ 10 - 4
src/main/java/com/goafanti/admin/controller/AdminApiController.java

@@ -1363,7 +1363,7 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, orgActivity.getUid()).getError().isEmpty()) {
 			return res;
 		}
-		
+
 		if (StringUtils.isBlank(orgActivity.getActivityNumber())) {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "研发活动编号"));
 			return res;
@@ -1391,7 +1391,7 @@ public class AdminApiController extends CertifyApiController {
 
 		OrgActivity oa = new OrgActivity();
 		BeanUtils.copyProperties(orgActivity, oa);
-	
+
 		if (StringUtils.isBlank(oa.getId())) {
 			oa.setId(UUID.randomUUID().toString());
 			oa.setDeletedSign(DeleteStatus.UNDELETE.getCode());
@@ -2811,8 +2811,14 @@ public class AdminApiController extends CertifyApiController {
 		BeanUtils.copyProperties(u, user);
 
 		if (StringUtils.isBlank(user.getId())) {
-			user.setId(UUID.randomUUID().toString());
-			userAbilityService.insert(user);
+			UserAbility uu = userAbilityService.selectUserAbilityByUserId(user.getUid());
+			if (null != uu) {
+				BeanUtils.copyProperties(user, uu);
+				userAbilityService.updateByPrimaryKeySelective(uu);
+			} else {
+				user.setId(UUID.randomUUID().toString());
+				userAbilityService.insert(user);
+			}
 		} else {
 			userAbilityService.updateByPrimaryKeySelective(user);
 		}

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

@@ -303,6 +303,11 @@ public class AdminContractApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (null == contract.getType()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "合同类型"));
+			return res;
+		}
 
 		User curUser = userService.selectByPrimaryKey(contract.getUid());
 		if (!checkCertify(res, curUser)) {
@@ -351,6 +356,11 @@ public class AdminContractApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到用户", "用户"));
 			return res;
 		}
+		
+		if (null == ic.getType()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "合同类型"));
+			return res;
+		}
 
 		User curUser = userService.selectByPrimaryKey(ic.getUid());
 		if (!checkCertify(res, curUser)) {

+ 12 - 0
src/main/java/com/goafanti/contract/controller/ContractApiController.java

@@ -175,6 +175,11 @@ public class ContractApiController extends CertifyApiController {
 			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "找不到合同ID", "合同ID"));
 			return res;
 		}
+		
+		if (null == contract.getType()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "合同类型"));
+			return res;
+		}
 
 		if (null != contract.getCognizanceYear() && !contract.getCognizanceYear().equals(0)) {
 			if (!disposeCog(contract.getCognizanceYear(), contract.getUid(), res).getError().isEmpty()) {
@@ -204,6 +209,13 @@ public class ContractApiController extends CertifyApiController {
 					ContractFields.getFieldDesc(bindingResult.getFieldError().getField())));
 			return res;
 		}
+		
+		if (null == contract.getType()){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "合同类型"));
+			return res;
+		}
+		
+		
 		User curUser = TokenManager.getUserToken();
 		if (!checkCertify(res, curUser)) {
 			return res;