From 66cc5b564555f6dd764782b871ea82f62655959a Mon Sep 17 00:00:00 2001
From: liujiaji <liujj@tenwa.com.cn>
Date: Mon, 6 Aug 2018 14:35:06 +0800
Subject: [PATCH] bug

---
 .../detail/process/DocLibraryStateUpdate.java | 36 +++++++++++--------
 .../impl/BusinessDocDetailServiceImpl.java    |  2 +-
 .../impl/LBDocAttributeServiceImpl.java       |  2 +-
 3 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/process/DocLibraryStateUpdate.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/process/DocLibraryStateUpdate.java
index 1e047b101..d72822c1e 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/process/DocLibraryStateUpdate.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/process/DocLibraryStateUpdate.java
@@ -13,34 +13,42 @@ import com.amarsoft.context.ASUser;
 
 public class DocLibraryStateUpdate {
 
-	public static void update(String libraryId, String type, ASUser CurUser, String CurTime, JBOTransaction tx)
-			throws JBOException {
+	public static void update(String libraryId, String type, ASUser CurUser,
+			String CurTime, JBOTransaction tx) throws JBOException {
 		try {
 			BizObjectManager bom = JBOFactory
 					.getBizObjectManager(LB_DOCLIBRARY.CLASS_NAME);
-			BizObject bo = bom.createQuery("ID=:ID").setParameter("ID", libraryId)
-					.getSingleResult(true);
+			BizObject bo = bom.createQuery("ID=:ID")
+					.setParameter("ID", libraryId).getSingleResult(true);
 
 			if (null == bo)
 				return;
-			tx.join(bom);		
-			BizObjectManager attM = JBOFactory.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME);
-			BizObject att = attM.createQuery("LIBRARY_ID=:LIBRARY_ID").setParameter("LIBRARY_ID", libraryId).getSingleResult(false);
+			tx.join(bom);
+			BizObjectManager attM = JBOFactory
+					.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME);
+			BizObject att = attM
+					.createQuery("LIBRARY_ID=:LIBRARY_ID AND DELETEED IS NULL")
+					.setParameter("LIBRARY_ID", libraryId)
+					.getSingleResult(false);
 			switch (type) {
 			case "1":
-				if (null == att) return; // 没有找到附件 不做已提交修改
-				bo.setAttributeValue("BUSINESS_CHECK", "DocCheck_0"); // DocCheck_0 已提交
+				if (null == att)
+					return; // 没有找到附件 不做已提交修改
+				bo.setAttributeValue("BUSINESS_CHECK", "DocCheck_0"); // DocCheck_0
+																		// 已提交
 				break;
 			case "-1":
-				if (null != att) return; // 附件未清空 不做未提交修改
-				bo.setAttributeValue("BUSINESS_CHECK", "DocCheck_2"); // DocCheck_2 未提交
+				if (null != att)
+					return; // 附件未清空 不做未提交修改
+				bo.setAttributeValue("BUSINESS_CHECK", "DocCheck_2"); // DocCheck_2
+																		// 未提交
 				break;
 			default:
 				return;
 			}
-			bo.setAttributeValue("UPDATEUSERID",CurUser.getUserID()); 
-			bo.setAttributeValue("UPDATEORGID", CurUser.getOrgID()); 
-			bo.setAttributeValue("UPDATETIME", CurTime); 
+			bo.setAttributeValue("UPDATEUSERID", CurUser.getUserID());
+			bo.setAttributeValue("UPDATEORGID", CurUser.getOrgID());
+			bo.setAttributeValue("UPDATETIME", CurTime);
 			bom.saveObject(bo);
 			tx.commit();
 		} catch (Exception e) {
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
index a30a76669..405a53d0f 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/BusinessDocDetailServiceImpl.java
@@ -347,7 +347,7 @@ public class BusinessDocDetailServiceImpl implements BusinessDocDetailService {
 			BizObjectManager attManage = JBOFactory
 					.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME);
 			List<BizObject> atts = attManage
-					.createQuery("LIBRARY_ID=:LIBRARY_ID")
+					.createQuery("LIBRARY_ID=:LIBRARY_ID AND DELETEED IS NULL")
 					.setParameter("LIBRARY_ID", libraryId).getResultList(false);
 			List<Map<String, Object>> attList = new ArrayList<Map<String, Object>>();
 			for (BizObject att : atts) {
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/LBDocAttributeServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/LBDocAttributeServiceImpl.java
index 15f2c4a4b..d4ab86f81 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/LBDocAttributeServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/doc/detail/service/impl/LBDocAttributeServiceImpl.java
@@ -40,7 +40,7 @@ public class LBDocAttributeServiceImpl implements LBDocAttributeService {
 
 		BizObjectManager bom = JBOFactory
 				.getBizObjectManager(LB_DOCATTRIBUTE.CLASS_NAME);
-		List<BizObject> bos = bom.createQuery("LIBRARY_ID=:LIBRARY_ID")
+		List<BizObject> bos = bom.createQuery("LIBRARY_ID=:LIBRARY_ID AND DELETEED IS NULL")
 				.setParameter("LIBRARY_ID", libraryId).getResultList(false);
 		List<Map<String, Object>> list = new ArrayList<Map<String, Object>>();
 		for (BizObject bo : bos) {