From ce79cc2666b9485abb9de4556d68d43ded4e9388 Mon Sep 17 00:00:00 2001
From: feige <feige@qq.com>
Date: 星期五, 08 九月 2023 16:27:52 +0800
Subject: [PATCH] 修改总上传的文件大小

---
 zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java |   19 ++++++++++++++-----
 1 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
index b67f269..bb15fc9 100644
--- a/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
+++ b/zhang-content/src/main/java/com/ruoyi/service/impl/ZfEventServiceImpl.java
@@ -17,6 +17,7 @@
 import com.ruoyi.service.ZAuthorityService;
 import com.ruoyi.service.ZInfoUserService;
 import com.ruoyi.service.ZfEventService;
+import com.ruoyi.service.ZfLogService;
 import com.ruoyi.util.ArraysUtil;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
@@ -24,10 +25,8 @@
 import org.springframework.web.multipart.MultipartFile;
 
 import javax.annotation.Resource;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
+import java.time.LocalDateTime;
+import java.util.*;
 import java.util.stream.Collectors;
 
 import static com.ruoyi.constant.MenuAuthority.*;
@@ -236,7 +235,7 @@
                         bean.setOwnData(0);
                     }
                 }
-        ).collect(Collectors.toList());
+        ).sorted((a,b)-> b.getOwnData()-a.getOwnData()).collect(Collectors.toList());
     }
 
 //    private static List<ZfEvent> markOwnData(String familyIds, List<ZfEvent> beanRecords) {
@@ -406,6 +405,9 @@
 
     }
 
+    @Resource
+    ZfLogService zfLogService;
+
     @Override
     public AjaxResult updateData(ZfEvent zfEvent) {
         ZInfoUser myself = zInfoUserService.getMyself();
@@ -422,6 +424,13 @@
             throw new RuntimeException("浣犳病鏈夋潈闄愭搷浣滄瀹跺涵鐨勬暟鎹�");
         }
 
+        //鎿嶄綔鍚庡姞鍏ユ棩蹇�
+        ZfLog zfLog = new ZfLog();
+        zfLog.setUpdateTime(LocalDateTime.now());
+        zfLog.setModule("瀹跺ぇ浜嬭");
+        zfLog.setUpdater(zInfoUserService.getMyself().getNickName());
+        zfLogService.save(zfLog);
+
         if(updateById(zfEvent)){
             return AjaxResult.success();
         }else {

--
Gitblit v1.9.1