diff --git a/src/main/java/com/sipai/controller/user/UserController.java b/src/main/java/com/sipai/controller/user/UserController.java index b738062a..ae3b9486 100644 --- a/src/main/java/com/sipai/controller/user/UserController.java +++ b/src/main/java/com/sipai/controller/user/UserController.java @@ -17,6 +17,7 @@ import io.swagger.annotations.*; import net.sf.json.JSONArray; import net.sf.json.JSONObject; import org.activiti.engine.RepositoryService; +import org.apache.commons.collections.CollectionUtils; import org.apache.commons.fileupload.servlet.ServletFileUpload; import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; @@ -864,6 +865,9 @@ public class UserController { public String getUsersByIds(HttpServletRequest request, Model model) { String userIds = request.getParameter("userIds"); List list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')"); + if (CollectionUtils.isNotEmpty(list)){ + list = list.stream().filter(u -> StringUtils.isNotBlank(u.getId())).collect(toList()); + } JSONArray json = JSONArray.fromObject(list); model.addAttribute("result", json); return "result"; diff --git a/src/main/webapp/jsp/user/jobList.jsp b/src/main/webapp/jsp/user/jobList.jsp index 00745b75..2fafbc06 100644 --- a/src/main/webapp/jsp/user/jobList.jsp +++ b/src/main/webapp/jsp/user/jobList.jsp @@ -20,7 +20,10 @@ src="<%=request.getContextPath()%>/node_modules/bootstrap-switch/dist/js/bootstrap-switch.min.js" charset="utf-8">