瀏覽代碼

Merge remote-tracking branch 'origin/dev' into dev

lazhaoqian 4 年之前
父節點
當前提交
be57124a83

+ 1 - 0
blade-service/blade-project/src/main/java/org/springblade/project/controller/ProjectController.java

@@ -183,6 +183,7 @@ public class ProjectController {
 			.	apply(StringUtils.isNotBlank(beginTime),"date_format(begin_time,'%Y-%m-%d') = '"+beginTime+"'")
 			.	apply(StringUtils.isNotBlank(actualDate),"date_format(actual_date,'%Y-%m-%d') = '"+actualDate+"'")
 			  .eq(ServiceProjectItem::getUserid,SecureUtil.getUserId())
+			  .orderByDesc(ServiceProjectItem::getUpdateTime)
 			  .eq(deptid!=null,ServiceProjectItem::getDeptid,deptid)
 			  .in(ServiceProjectItem::getStatus,listStatus);
 		  Page<ServiceProjectItem> page=new Page<>(current,size);