--no commit message

com.zrqx.newbook/src/main/java/com/zrqx/newbook/bg/service/thriceaudit/ThriceAuditServiceImpl.java

@@ -16,6 +16,7 @@ import com.zrqx.core.model.newbook.thriceaudit.ThriceAuditLog;
 import com.zrqx.core.model.newbook.thriceaudit.ThriceAuditLogHistory;
 import com.zrqx.core.model.newbook.typographic.BookTypographicDesign;
 import com.zrqx.core.service.BaseServiceImpl;
+import com.zrqx.core.util.ArrayUtils;
 import com.zrqx.core.util.PageInfo;
 import com.zrqx.core.util.PageParam;
 import com.zrqx.core.vo.newbook.thriceaudit.ThriceAuditListVo;
@@ -304,24 +305,22 @@ public class ThriceAuditServiceImpl extends BaseServiceImpl<ThriceAudit, Integer
                         //判断流程编辑是否推送发排
                         BookTypographicDesign design = new BookTypographicDesign();
                         design.setSubjectNum(audit.getSubjectNum());
-                        BookTypographicDesign bookDesign = typographicManage.selectForId(design);
-                        Integer typoId = null;
-                        if (bookDesign != null){// 已推送
-                            typoId = bookDesign.getId();
-                        }else{
-                            typoId = this.pushData(audit, BookTypographicDesign.class);
+                        design.setBookType("1");
+                        List<BookTypographicDesign> bookDesign = typographicManage.select(design);
+                        if (ArrayUtils.isNotEmpty(bookDesign)){// 已推送
+                            typographicManage.delete(bookDesign);
                         }
+                        Integer typoId = this.pushData(audit, BookTypographicDesign.class);
                         //数据推送封面
                         //判断流程编辑是否推送封面
                         BookCoverDesign cover = new BookCoverDesign();
                         cover.setSubjectNum(audit.getSubjectNum());
-                        BookCoverDesign coverDesign = coverDesignManage.selectForId(cover);
-                        Integer coverId = null;
-                        if (coverDesign != null){// 已推送
-                            coverId = coverDesign.getId();
-                        }else{
-                            coverId = this.pushData(audit, BookCoverDesign.class);
+                        cover.setBookType("1");
+                        List<BookCoverDesign> coverDesign = coverDesignManage.select(cover);
+                        if (ArrayUtils.isNotEmpty(coverDesign)){// 已推送
+                            coverDesignManage.delete(coverDesign);
                         }
+                        Integer coverId = this.pushData(audit, BookCoverDesign.class);
                         //生成CIP，发排，封面三阶段的关系数据
                         this.saveRelation(cipId, typoId, coverId);
                     } else {