--no commit message

com.zrqx.resource/src/main/java/com/zrqx/resource/bg/controller/copyright/CopyrightController.java

@@ -10,6 +10,7 @@ import com.zrqx.core.form.newbook.ExportForm;
 import com.zrqx.core.form.resource.bg.copyright.DeleteCopyrightResourceForm;
 import com.zrqx.core.model.newbook.subject.SelectedSubject;
 import com.zrqx.core.model.newbook.thriceaudit.ThriceAudit;
+import com.zrqx.core.util.*;
 import com.zrqx.core.vo.newbook.subject.SelectedSubjectVo;
 import com.zrqx.core.vo.resource.copyright.*;
 import com.zrqx.resource.bg.client.newbook.NewBookClient;
@@ -45,12 +46,6 @@ import com.zrqx.core.form.resource.bg.copyright.CopyrightListForm;
 import com.zrqx.core.form.resource.bg.copyright.SaveUpdateCopyrightForm;
 import com.zrqx.core.model.resource.copyright.Copyright;
 import com.zrqx.core.model.resource.copyright.CopyrightResource;
-import com.zrqx.core.util.CallBack;
-import com.zrqx.core.util.Copy;
-import com.zrqx.core.util.DateUtils;
-import com.zrqx.core.util.PageInfo;
-import com.zrqx.core.util.PageParam;
-import com.zrqx.core.util.UUIDUtil;
 import com.zrqx.core.util.excelutil.ExcelUtil;
 import com.zrqx.resource.bg.service.copyright.CopyrightResourceService;
 import com.zrqx.resource.bg.service.copyright.CopyrightService;
@@ -380,13 +375,18 @@ public class CopyrightController {
 				ImportExcelCopyrightVo ec = list.get(i);
 				BeanUtils.copyProperties(ec, copyright);
 				List<Copyright> tlList = service.select(copyright);
-				if (tlList == null || tlList.size() > 0) {
+				if (ArrayUtils.isNotEmpty(tlList) && tlList.size() > 0) {
 					continue;
 				}
 				copyright.setId(UUIDUtil.getUUID());
-				copyright.setEndTime(DateUtils.strToDateTime(ec.getEndTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
-				copyright.setSigningTime(DateUtils.strToDateTime(ec.getSigningTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
-				copyright.setTerm(0);
+				if (StringUtils.isNotBlank(ec.getSigningTime())){
+					copyright.setEndTime(DateUtils.strToDateTime(ec.getEndTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
+					copyright.setSigningTime(DateUtils.strToDateTime(ec.getSigningTime(), DateUtils.DATE_FORMAT_YYYY_MM_DD));
+					copyright.setTerm(0);
+				}else{
+					copyright.setTerm(1);
+				}
+
 				if (!service.insert(copyright)) {
 					// 第几行添加失败 2是起始行
 					int fail = i + 2;