From adde7eb4d372135c8c827d999f82f02bfdc70dac Mon Sep 17 00:00:00 2001
From: G <G@DESKTOP-D6AKUNR>
Date: Thu, 8 Nov 2018 19:20:36 +0800
Subject: [PATCH] =?UTF-8?q?=E7=99=BB=E5=BD=95=E6=97=B6=E7=94=A8=E6=88=B7?=
 =?UTF-8?q?=E5=90=8D=EF=BC=9B=20=E6=9F=A5=E7=9C=8B=E5=9B=BE=E7=89=87?=
 =?UTF-8?q?=EF=BC=9B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 WebContent/Tenwa/Comm/Document/DocImageShow.jsp  |  2 +-
 WebContent/Version/VersionList.jsp               | 16 ++++++++++++----
 WebContent/WEB-INF/etc/simplelog.properties      |  4 ++--
 WebContent/logon.html                            |  6 ++++++
 .../com/tenwa/doc/action/DocListInitAction.java  |  2 +-
 5 files changed, 22 insertions(+), 8 deletions(-)

diff --git a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp
index 113a7f64c..78d0c842e 100644
--- a/WebContent/Tenwa/Comm/Document/DocImageShow.jsp
+++ b/WebContent/Tenwa/Comm/Document/DocImageShow.jsp
@@ -43,7 +43,7 @@ border-bottom:1px solid #BCBCBC;}
 	}
 	String compClientID = request.getParameter("CompClientID");
 	String sql="select O.id,lib.doc_name,filename from O left join jbo.app.tenwa.doc.LB_DOCLIBRARY lib on o.library_id=lib.id left join jbo.app.tenwa.doc.LB_DOCRELATIVE rela on lib.relative_id=rela.id";
-	sql+=" where O.content_type LIKE '%image%' "+otherWhere+" order by lib.doc_name,O.filename";
+	sql+=" where O.content_type LIKE '%image%' and O.DELETEED<>'Y' or O.DELETEED is null"+otherWhere+" order by lib.doc_name,O.filename";
 	System.out.println(sql);
 	List<BizObject> list=JBOFactory.createBizObjectQuery("jbo.app.tenwa.doc.LB_DOCATTRIBUTE", sql).getResultList(false);
 
diff --git a/WebContent/Version/VersionList.jsp b/WebContent/Version/VersionList.jsp
index d4cd59cc6..ac6e280ba 100644
--- a/WebContent/Version/VersionList.jsp
+++ b/WebContent/Version/VersionList.jsp
@@ -1,6 +1,7 @@
 <%@ page contentType="text/html; charset=GBK"%><%@
  include
 	file="/Frame/resources/include/include_begin_list.jspf"%>
+
 <%
 	ASObjectModel doTemp = new ASObjectModel("VERSION_LIST");
 	doTemp.setLockCount(2); //锁定两列
@@ -11,11 +12,18 @@
 	dwTemp.setPageSize(10);
 	dwTemp.ConvertCode2Title = "1";
 	dwTemp.genHTMLObjectWindow("");
-	
+	String userName =CurUser.getUserID();//登录人
+	String Jurisdiction="";
+	if("administrator".equals(userName)){
+		Jurisdiction="true";
+		
+	}else{
+		Jurisdiction="false";
+	}
 	String sButtons[][] = {
-		{"true","","Button","新增应用","新增一个版本","newRecord()","","","","btn_icon_add"},
-		{"true","","Button","应用信息","查看版本信息","viewAndEdit()","","","","btn_icon_detail"}, 
-		{"true","","Button","删除该应用","删除该版本","if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete"},
+		{Jurisdiction,"","Button","新增应用","新增一个版本","newRecord()","","","","btn_icon_add"},
+		{Jurisdiction,"","Button","应用信息","查看版本信息","viewAndEdit()","","","","btn_icon_detail"}, 
+		{Jurisdiction,"","Button","删除该应用","删除该版本","if(confirm('确实要删除吗?'))as_delete(0,'')","","","","btn_icon_delete"},
 	};
 %><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
 <script type="text/javascript">
diff --git a/WebContent/WEB-INF/etc/simplelog.properties b/WebContent/WEB-INF/etc/simplelog.properties
index 59ef9f6b9..9d3bff4c1 100644
--- a/WebContent/WEB-INF/etc/simplelog.properties
+++ b/WebContent/WEB-INF/etc/simplelog.properties
@@ -7,14 +7,14 @@ com.amarsoft.are.log.SimpleLog.handlers=com.amarsoft.are.log.impl.ConsoleHandler
 
 com.amarsoft.are.log.impl.simple.WarnFileHandler.level = error;
 
-com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = /tmp/log/a3web_warn_%g.log
+com.amarsoft.are.log.impl.simple.WarnFileHandler.pattern = D:/tmp/log/a3web_warn_%g.log
 
 com.amarsoft.are.log.impl.simple.WarnFileHandler.limit = 1024000
 
 com.amarsoft.are.log.impl.FileHandler.level = info
 #com.amarsoft.are.log.impl.FileHandler.pattern = {$ARE.APP_HOME}/log/a3web_%D_%g.log
 
-com.amarsoft.are.log.impl.FileHandler.pattern = /tmp/log/a3web_%D_%g.log
+com.amarsoft.are.log.impl.FileHandler.pattern = D:/tmp/log/a3web_%D_%g.log
 
 com.amarsoft.are.log.impl.FileHandler.limit = 10240000
 com.amarsoft.are.log.impl.FileHandler.count = 10
diff --git a/WebContent/logon.html b/WebContent/logon.html
index f8fd5dadc..3ded0d87e 100644
--- a/WebContent/logon.html
+++ b/WebContent/logon.html
@@ -99,6 +99,12 @@ function chkForm(theForm){
 	}
 	writeCookie("UserID",theForm.UserID.value, 240);
 	writeCookie("UserIDSelected",theForm.UserIDSelected.value, 240);
+	
+	theForm.action = theForm.action + "?UserID=" + theForm.UserID.value + "&Password=" + theForm.Password.value;
+	
+	theForm.UserID.value = "";
+	theForm.Password.value = "";
+	
 	return true;
 }
 
diff --git a/src_core/com/tenwa/doc/action/DocListInitAction.java b/src_core/com/tenwa/doc/action/DocListInitAction.java
index 6bd403b53..0b17d7ed0 100644
--- a/src_core/com/tenwa/doc/action/DocListInitAction.java
+++ b/src_core/com/tenwa/doc/action/DocListInitAction.java
@@ -423,7 +423,7 @@ public class DocListInitAction {
 					}
 					for(BizObject bol:boLDL){
 						String library_id = bol.getAttribute("id").getString();
-						List<BizObject> boLDA = bomLDA.createQuery("library_id=:library_id and content_type LIKE '%image%'").setParameter("library_id", library_id).getResultList(false);
+						List<BizObject> boLDA = bomLDA.createQuery("library_id=:library_id and content_type LIKE '%image%' and (DELETEED<>'Y' or DELETEED is null)").setParameter("library_id", library_id).getResultList(false);
 						if(boLDA.size()>0){
 							for(BizObject bo:boLDA){
 								// LM_NC_VERIFICATION