BUG修复及消息提醒

blade-service/blade-business/src/main/java/org/springblade/business/controller/InformationWriteQueryController.java

@@ -1187,7 +1187,7 @@ public class InformationWriteQueryController extends BladeController {
 		List<String> idArray = JSONArray.parseArray(JSONObject.toJSONString(ids.split(",")), String.class);
 		this.operationLogClient.saveUserOperationLog(4, "资料管理", "工序资料", idArray, nodeName);
 		//保存进回收站
-		this.recycleBinClient.saveDelBusinessData(idArray, removeNode.getDeptName(), 2, parentNodeName.toString(), removeNode.getProjectId(), removeNode.getContractId());
+		this.recycleBinClient.saveDelBusinessData(idArray, StringUtils.isNotEmpty(removeNode.getFullName()) ? removeNode.getFullName() : removeNode.getDeptName(), 2, parentNodeName.toString(), removeNode.getProjectId(), removeNode.getContractId());
 
 		return R.data(this.wbsTreeContractClient.removeContractTreeNode(idArray));
 	}

blade-service/blade-business/src/main/java/org/springblade/business/mapper/InformationQueryMapper.xml

@@ -177,6 +177,7 @@
                     #{wbsIdc}
                 </foreach>
             </if>
+            order by create_time DESC
         ) AS query
         where
           1 = 1