合并上一次提交

eladmin-system/src/main/java/me/zhengjie/application/admin/service/impl/NotaryOfficeServiceImpl.java

@@ -33,9 +33,11 @@ import me.zhengjie.base.util.CFCACertUtil;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.stereotype.Service;
+import org.springframework.util.ObjectUtils;
 import org.springframework.util.StringUtils;
 
 import javax.transaction.Transactional;
+import java.sql.SQLIntegrityConstraintViolationException;
 import java.text.SimpleDateFormat;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
@@ -245,7 +247,8 @@ public class NotaryOfficeServiceImpl extends ServiceImpl<NotaryOfficeMapper, Not
 	@Override
 	public AppBaseResponse update(NotaryOfficeCreateReq req) {
 		AppBaseResponse response = new AppBaseResponse();
-		if (notaryOfficeRepository.getNotaryOfficeByNameAndCode(req.getNotaryOfficeCode()) != null) {
+		NotaryOfficeEntity notaryOfficeByNameAndCode = notaryOfficeRepository.getNotaryOfficeByNameAndCode(req.getNotaryOfficeCode());
+		if (!ObjectUtils.isEmpty(notaryOfficeByNameAndCode) && !notaryOfficeByNameAndCode.getId().equals(req.getId())) {
 			response.fail(ResultCode.NOTARY_OFFICE_CODE_ALREADY_EXISTS);
 			return response;
 		}