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 taskPage = taskDao.find(page, dc); if (!taskPage.getList().isEmpty()){ for (Task task: taskPage.getList()) {