From 034c0bea819687ba4a315b4f77fb9e4ac380cfbf Mon Sep 17 00:00:00 2001
From: zhal <15900249928@163.com>
Date: Mon, 31 Jul 2023 20:00:33 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E7=8A=B6=E6=80=81=E4=BB=A3?=
 =?UTF-8?q?=E7=A0=81=E6=8F=90=E4=BA=A4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../app/controller/UpateFileStateController.java   | 14 +++++++++++---
 .../app/integration/job/SendReadBycontract.java    |  2 +-
 .../awspaas/user/apps/app/util/GetNodesUtil.java   |  2 +-
 3 files changed, 13 insertions(+), 5 deletions(-)

diff --git a/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/controller/UpateFileStateController.java b/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/controller/UpateFileStateController.java
index df543142..32425e6c 100644
--- a/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/controller/UpateFileStateController.java
+++ b/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/controller/UpateFileStateController.java
@@ -72,7 +72,9 @@ public class UpateFileStateController {
 			 * "'WHERE PALREPOSITORYID='" + plId + "'"); } }
 			 */
 
-				PALRepositoryCache.getCache().reload();
+				PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(plId);
+				PALRepositoryCache.getCache().put(plId, palRepositoryModel);
+
 				SDK.getLogAPI().consoleInfo("更新状态后刷新缓存结束===========>");
 				if(Integer.valueOf(state) == 1){
 					createPermScopeData(plId , me);
@@ -84,7 +86,10 @@ public class UpateFileStateController {
 						+ "'";
 				System.err.println("审批改为设计=======>" + updataSql);
 				count = DBSql.update(updataSql);
-				PALRepositoryCache.getCache().reload();
+
+				PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(plId);
+				PALRepositoryCache.getCache().put(plId, palRepositoryModel);
+
 				SDK.getLogAPI().consoleInfo("更新状态后刷新缓存结束===========>");
 			} else if ("3".equals(type)) {
 				// 重新生成手册
@@ -115,7 +120,10 @@ public class UpateFileStateController {
 						+ "'";
 				System.err.println("停用改设计=======>" + updataSql);
 				count = DBSql.update(updataSql);
-				PALRepositoryCache.getCache().reload();
+
+				PALRepositoryModel palRepositoryModel = PALRepositoryCache.getCache().get(plId);
+				PALRepositoryCache.getCache().put(plId, palRepositoryModel);
+
 				SDK.getLogAPI().consoleInfo("更新状态后刷新缓存结束===========>");
 			}
 		}
diff --git a/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/integration/job/SendReadBycontract.java b/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/integration/job/SendReadBycontract.java
index fe90b104..fece6eac 100644
--- a/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/integration/job/SendReadBycontract.java
+++ b/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/integration/job/SendReadBycontract.java
@@ -107,7 +107,7 @@ public class SendReadBycontract implements IJob {
         	//待阅更新已读记录
         	if("3".equals(logType)) {
         		String dateTime = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(new Date());
-        		RowMap map = DBSql.getMap("SELECT * FROM BO_ACT_DATAID WHERE PROCESSID = '"+processInstId+"' AND USER_ID = '"+userid+"' AND READSTATE = '已读'");
+        		RowMap map = DBSql.getMap("SELECT READCOUNT FROM BO_ACT_DATAID WHERE PROCESSID = '"+processInstId+"' AND USER_ID = '"+userid+"' AND READSTATE = '已读'");
         		if(null!=map) {
         			int readCount = map.getInt("READCOUNT")+1;
         			DBSql.update("UPDATE BO_ACT_DATAID SET READSTATE = '已读',READTIMES = '"+dateTime+"',READCOUNT = "+readCount+" WHERE PROCESSID = '"+processInstId+"' AND USER_ID = '"+userid+"'");
diff --git a/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/util/GetNodesUtil.java b/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/util/GetNodesUtil.java
index c0085e7c..1c6672fd 100644
--- a/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/util/GetNodesUtil.java
+++ b/com.awspaas.user.apps.app20221008163300/src/com/awspaas/user/apps/app/util/GetNodesUtil.java
@@ -82,7 +82,7 @@ public class GetNodesUtil {
         sqlParams = new Object[]{fileID};
         RowMap parentFile = DBSql.getMap("SELECT FRAMEID,FRAMENAME,FRAMELEVEL,FRAMEPARENTID,FRAMEORDERINDEX FROM BO_EU_PAL_FRAME WHERE FRAMEID=?", sqlParams);
         if (null!=parentFile && !parentFile.isEmpty()) {
-            if (parentFile.getInt("FRAMELEVEL")<=3) {
+            if (parentFile.getInt("FRAMELEVEL")<=4) {
                 fileIDMaps.add(parentFile);
                 if (parentFile.getInt("FRAMELEVEL")>1) {
                     fileID = parentFile.getString("FRAMEPARENTID");