diff --git a/src_core/com/tenwa/doc/action/DocListAction.java b/src_core/com/tenwa/doc/action/DocListAction.java index cee57e85a..952039899 100644 --- a/src_core/com/tenwa/doc/action/DocListAction.java +++ b/src_core/com/tenwa/doc/action/DocListAction.java @@ -55,7 +55,8 @@ public class DocListAction { delDocFile("LB_DOCATTRIBUTE","id='"+this.attId+"'",Transaction.createTransaction(tx)); BizObjectManager bm=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE", tx); String library_id=bm.createQuery("select library_id from O where id=:id").setParameter("id", this.attId).getSingleResult(false).getAttribute("library_id").getString(); - bm.createQuery("delete from O where id=:id").setParameter("id", attId).executeUpdate(); + //bm.createQuery("delete from O where id=:id").setParameter("id", attId).executeUpdate(); + bm.createQuery("update O set DELETEED='Y' where id=:id").setParameter("id", attId).executeUpdate(); BizObjectManager bm1=JBOFactory.getBizObjectManager(jbo.app.tenwa.doc.LB_DOCLIBRARY.CLASS_NAME); bm1.createQuery("update O set BUSINESS_CHECK=:BussinessCheck where id=:id").setParameter("BussinessCheck", this.BussinessCheck).setParameter("id", library_id).executeUpdate(); tx.commit(); diff --git a/src_core/com/tenwa/doc/cache/DocListCache.java b/src_core/com/tenwa/doc/cache/DocListCache.java index 7eedbbc96..1bc04e909 100644 --- a/src_core/com/tenwa/doc/cache/DocListCache.java +++ b/src_core/com/tenwa/doc/cache/DocListCache.java @@ -12,7 +12,7 @@ public class DocListCache { public static String getFile(String libraryid) throws Exception{ @SuppressWarnings("unchecked") - List list=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE").createQuery("Library_Id=:libraryid").setParameter("libraryid", libraryid).getResultList(false); + List list=JBOFactory.getBizObjectManager("jbo.app.tenwa.doc.LB_DOCATTRIBUTE").createQuery("Library_Id=:libraryid and (DELETEED<>'Y' or DELETEED is null)").setParameter("libraryid", libraryid).getResultList(false); StringBuffer sb=new StringBuffer(); sb.append("{");