|
@@ -14,6 +14,7 @@ import cn.cslg.pas.service.common.PatentStarApiService;
|
|
import cn.hutool.core.util.IdUtil;
|
|
import cn.hutool.core.util.IdUtil;
|
|
import org.apache.commons.fileupload.FileItem;
|
|
import org.apache.commons.fileupload.FileItem;
|
|
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
|
import org.apache.commons.fileupload.disk.DiskFileItemFactory;
|
|
|
|
+import org.apache.commons.lang3.StringUtils;
|
|
import org.dom4j.Document;
|
|
import org.dom4j.Document;
|
|
import org.dom4j.Element;
|
|
import org.dom4j.Element;
|
|
import org.dom4j.XPath;
|
|
import org.dom4j.XPath;
|
|
@@ -58,7 +59,7 @@ public class GetPatentPictureFromWebThread extends Thread {
|
|
UploadPatentWebDTO uploadPatentWebDTO = uploadPatentWebDTOs.remove(0);
|
|
UploadPatentWebDTO uploadPatentWebDTO = uploadPatentWebDTOs.remove(0);
|
|
try {
|
|
try {
|
|
String usedNo = uploadPatentWebDTO.getStarPatentVO().getPublicNo();
|
|
String usedNo = uploadPatentWebDTO.getStarPatentVO().getPublicNo();
|
|
- if (usedNo == null) {
|
|
|
|
|
|
+ if (StringUtils.isEmpty(usedNo)) {
|
|
usedNo = uploadPatentWebDTO.getStarPatentVO().getPublicAccreditNo();
|
|
usedNo = uploadPatentWebDTO.getStarPatentVO().getPublicAccreditNo();
|
|
}
|
|
}
|
|
if (usedNo.contains("CN")) {
|
|
if (usedNo.contains("CN")) {
|