Antiloveg 8 years ago
parent
commit
6c1807ba4c

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

@@ -2724,6 +2724,11 @@ public class AdminApiController extends CertifyApiController {
 		if (!checkCertify(res, cog.getUid()).getError().isEmpty()) {
 			return res;
 		}
+		
+		if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.ISSUING && StringUtils.isBlank(cog.getCertificateNumber())){
+			res.getError().add(buildError(ErrorConstants.PARAM_EMPTY_ERROR, "", "证书编号"));
+			return res;
+		}
 		Date recordTime = null;
 		if (!StringUtils.isBlank(recordTimeFormattedDate)) {
 			try {

+ 1 - 1
src/main/java/com/goafanti/cognizance/service/impl/OrgCognizanceServiceImpl.java

@@ -234,7 +234,7 @@ public class OrgCognizanceServiceImpl extends BaseMybatisDao<OrgCognizanceMapper
 				cog.setAcceptDate(recordTime);
 			} else if (OrgCognizanceStatus.getStatus(cog.getState()) == OrgCognizanceStatus.ISSUING) {
 				cog.setIssuingDate(recordTime);
-				o.setCertificateNumber(null == cog.getCertificateNumber() ? "" : cog.getCertificateNumber());
+				o.setCertificateNumber(StringUtils.isBlank(cog.getCertificateNumber()) ? "" : cog.getCertificateNumber());
 				o.setIssuingDate(recordTime);
 				o.setCogContacts(null == cog.getContacts() ? null : cog.getContacts());
 				organizationIdentityMapper.updateByPrimaryKeySelective(o);