|
|
@ -310,9 +310,11 @@ public class FlowTaskController extends BaseController {
|
|
|
|
searchQuery.addLike("fromtaskname", taskName);
|
|
|
|
searchQuery.addLike("fromtaskname", taskName);
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
//获取用户预设检索条件id
|
|
|
|
//获取用户预设检索条件id,如果存在检索条件,则高级检索失效
|
|
|
|
String userSearchId = request.getParameter("userSearchId");
|
|
|
|
String userSearchId = "";
|
|
|
|
|
|
|
|
if(StringUtils.isBlank(taskName)){
|
|
|
|
|
|
|
|
userSearchId = request.getParameter("userSearchId");
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
User user = this.userService.getSessionUser(request);
|
|
|
|
User user = this.userService.getSessionUser(request);
|
|
|
|
if (user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))) {
|
|
|
|
if (user.isUserIsSys(xiaoyaoConfig.getWebconfig().getSysLoginUser().split(","))) {
|
|
|
|