From 86cd79f43d61703de20a4bc51ef247c6eff79c3e Mon Sep 17 00:00:00 2001
From: chengminglong <123204464@qq.com>
Date: Thu, 12 Jan 2023 16:34:06 +0800
Subject: [PATCH] =?UTF-8?q?2023-01-12=20=E6=96=87=E4=BB=B6=E4=B8=8B?=
 =?UTF-8?q?=E8=BD=BDBUG=20&=20=E6=95=99=E8=82=B2=E5=B1=80=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E5=8F=AF=E7=9C=8B=E5=88=B0=E5=85=B6=E4=BB=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E7=94=B3=E8=AF=B7=E7=9A=84=E9=A1=B9=E7=9B=AE=E7=9A=84?=
 =?UTF-8?q?BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/dsideal/modules/common/utils/FileUtil.java     | 4 +++-
 .../com/dsideal/modules/project/service/TaskService.java    | 6 ++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/common/utils/FileUtil.java b/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/common/utils/FileUtil.java
index 72be6eca..f38fa9a7 100644
--- a/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/common/utils/FileUtil.java
+++ b/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/common/utils/FileUtil.java
@@ -16,6 +16,7 @@ import java.io.*;
 import java.lang.reflect.Field;
 import java.lang.reflect.InvocationTargetException;
 import java.lang.reflect.Method;
+import java.net.URLEncoder;
 import java.util.*;
 
 /**
@@ -124,6 +125,8 @@ public class FileUtil {
     public static String getRootWebUrlStr(HttpServletRequest request, String path) throws Exception {
         String root = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/";
         //获取配置文件中需要保存的位置
+        String fileName = path.substring(path.lastIndexOf("\\") + 1, path.length());
+        path = path.substring(0, path.lastIndexOf("\\") + 1) + URLEncoder.encode(fileName, "utf-8").replaceAll("\\+","%20");
 
         if (StringUtils.isNotBlank(path)) {
             while (path.indexOf("\\") != -1) {
@@ -134,7 +137,6 @@ public class FileUtil {
             }
         }
 
-
         if (WEBURL_REMOTE_BEUSE && StringUtils.isNotBlank(WEBURL_REMOTE_PATH)) {
             root = xmlConfig_webUrl.getResourcesvalue() + path;
         } else {
diff --git a/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/project/service/TaskService.java b/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/project/service/TaskService.java
index 98d35e92..d78f991f 100644
--- a/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/project/service/TaskService.java
+++ b/长春市教育局附加预算系统/base-parent-ccs/business_project/src/main/java/com/dsideal/modules/project/service/TaskService.java
@@ -96,7 +96,7 @@ public class TaskService extends BaseService {
         return taskDao.findBySn(taskSn);
     }
 
-      /**
+    /**
      * 经办查询(项目管理)
      *
      * @param page
@@ -685,7 +685,7 @@ public class TaskService extends BaseService {
 
 //        dc.add(Restrictions.eq("sendOrg",user.getOrgId()));
 //        dc.add(Restrictions.eq("sendOrg", user.getOrgId()));
-//        Criterion criterionSendUser = Restrictions.eq("sendUser", user.getId());
+        Criterion criterionSendUser = Restrictions.eq("sendUser", user.getId());
 
         //只查询当前所在单位项目
         Criterion criterionSendOrg = Restrictions.eq("sendOrg", user.getOrgId());
@@ -693,6 +693,8 @@ public class TaskService extends BaseService {
 
 //        dc.add(Restrictions.or(criterionSendUser, Restrictions.or(criterionSendOrg, criterionExSendOrg)));
         dc.add(Restrictions.or(criterionSendOrg, criterionExSendOrg));
+        dc.add(criterionSendUser);
+
         Page<Task> taskPage = taskDao.find(page, dc);
         if (!taskPage.getList().isEmpty()){
             for (Task task: taskPage.getList()) {