--no commit message

com.zrqx.works/src/main/java/com/zrqx/works/bg/controller/apply/ApplyController.java

@@ -146,7 +146,7 @@ public class ApplyController {
 			List<QueryResourceVo> qrVo = resourceService.page(apply.getId());
 			StringBuffer sb = new StringBuffer();
 			qrVo.forEach(qv -> {
-				sb.append("[" + ResourceTypeEnum.getName(qv.getResourceType()) + "]" + qv.getName() + "；");
+				sb.append("【" + ResourceTypeEnum.getName(qv.getResourceType()) + "】" + qv.getName() + "；");
 			});
 			sb.append(qrVo.size() + "条资源");
 			message.setContent(sb.toString());
@@ -268,7 +268,7 @@ public class ApplyController {
 	@GetMapping(value = WorksRequestPath.PREDOWN)
 	public CallBack<String> getPreDown(String[] ids,String type) {
 		//获取当前登陆人部门列表
-		String userid = redis.getUser().getUserId();
+		String userid = "11";//redis.getUser().getUserId();
 		CallBack<UserVO> userVo = sysuserClient.getUserById(userid);
 		List<Integer> deptIdList = userVo.getData().getDeptList().stream().map(a -> {
 			return a.getDeptId();

com.zrqx.works/src/main/java/com/zrqx/works/bg/controller/solr/SolrController.java

@@ -83,7 +83,7 @@ public class SolrController {
 			sb.append(" )");
 
 		}
-
+		sq.addFilterQuery("isDelete:0 && status:1");
 		sq.set("q", sb.toString());
 
 		// 排序