2023-01-12 文件下载BUG & 教育局部门可看到其他部门申请的项目的BUG

develop
chengminglong 3 years ago
parent 30c36ac01d
commit 86cd79f43d

@ -16,6 +16,7 @@ import java.io.*;
import java.lang.reflect.Field; import java.lang.reflect.Field;
import java.lang.reflect.InvocationTargetException; import java.lang.reflect.InvocationTargetException;
import java.lang.reflect.Method; import java.lang.reflect.Method;
import java.net.URLEncoder;
import java.util.*; import java.util.*;
/** /**
@ -124,6 +125,8 @@ public class FileUtil {
public static String getRootWebUrlStr(HttpServletRequest request, String path) throws Exception { public static String getRootWebUrlStr(HttpServletRequest request, String path) throws Exception {
String root = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort() + request.getContextPath() + "/"; 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)) { if (StringUtils.isNotBlank(path)) {
while (path.indexOf("\\") != -1) { while (path.indexOf("\\") != -1) {
@ -134,7 +137,6 @@ public class FileUtil {
} }
} }
if (WEBURL_REMOTE_BEUSE && StringUtils.isNotBlank(WEBURL_REMOTE_PATH)) { if (WEBURL_REMOTE_BEUSE && StringUtils.isNotBlank(WEBURL_REMOTE_PATH)) {
root = xmlConfig_webUrl.getResourcesvalue() + path; root = xmlConfig_webUrl.getResourcesvalue() + path;
} else { } else {

@ -96,7 +96,7 @@ public class TaskService extends BaseService {
return taskDao.findBySn(taskSn); return taskDao.findBySn(taskSn);
} }
/** /**
* () * ()
* *
* @param page * @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()));
// 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()); 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(criterionSendUser, Restrictions.or(criterionSendOrg, criterionExSendOrg)));
dc.add(Restrictions.or(criterionSendOrg, criterionExSendOrg)); dc.add(Restrictions.or(criterionSendOrg, criterionExSendOrg));
dc.add(criterionSendUser);
Page<Task> taskPage = taskDao.find(page, dc); Page<Task> taskPage = taskDao.find(page, dc);
if (!taskPage.getList().isEmpty()){ if (!taskPage.getList().isEmpty()){
for (Task task: taskPage.getList()) { for (Task task: taskPage.getList()) {

Loading…
Cancel
Save