日志、租户管理，按时间倒序

user_center/src/main/java/com/huaxu/controller/LoginLogController.java

@@ -1,6 +1,7 @@
 package com.huaxu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.common.EasyExcelUtil;
 import com.huaxu.dto.LoginLogDto;
@@ -150,6 +151,12 @@ public class LoginLogController {
         }
 
         IPage<LoginLogDto> iPage = new Page<>(pageNum, pageSize);
+        if(iPage.orders().size() == 0){
+            OrderItem orderItem =new OrderItem();
+            orderItem.setAsc(false);
+            orderItem.setColumn("a.create_time");
+            iPage.orders().add(orderItem);
+        }
 
         iPage = loginLogService.selectPage(iPage, loginLogDto);
 

user_center/src/main/java/com/huaxu/controller/OperateLogController.java

@@ -1,6 +1,7 @@
 package com.huaxu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.common.EasyExcelUtil;
 import com.huaxu.dto.LoginLogDto;
@@ -147,7 +148,12 @@ public class OperateLogController {
             operateLogDto.setBeginTime(new Date());
         }
         IPage<OperateLogDto> iPage = new Page<>(pageNum, pageSize);
-
+        if(iPage.orders().size() == 0){
+            OrderItem orderItem =new OrderItem();
+            orderItem.setAsc(false);
+            orderItem.setColumn("a.create_time");
+            iPage.orders().add(orderItem);
+        }
         iPage = operateLogService.selectPage(iPage, operateLogDto);
 
         Pagination<OperateLogDto> pages = new Pagination<>(iPage);

user_center/src/main/java/com/huaxu/controller/TenantController.java

@@ -1,6 +1,7 @@
 package com.huaxu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.baomidou.mybatisplus.core.metadata.OrderItem;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.huaxu.common.FileUploadUtil;
 import com.huaxu.dto.TenantDto;
@@ -163,7 +164,12 @@ public class TenantController {
         TenantDto tenantDto = new TenantDto();
         tenantDto.setTenantName(tenantName);
         IPage<TenantDto> iPage = new Page<>(pageNum, pageSize);
-
+        if(iPage.orders().size() == 0){
+            OrderItem orderItem =new OrderItem();
+            orderItem.setAsc(false);
+            orderItem.setColumn("t.date_create");
+            iPage.orders().add(orderItem);
+        }
         iPage = tenantService.selectPage(iPage, tenantDto );
 
         Pagination<TenantDto> pages = new Pagination<>(iPage);

user_center/src/main/resources/mapper/LoginLogMapper.xml

@@ -167,7 +167,6 @@
                 and a.create_time <= #{loginLogDto.endTime}
             </if>
         </where>
-        order by a.create_time desc
     </select>
 
 </mapper>

user_center/src/main/resources/mapper/OperateLogMapper.xml

@@ -163,6 +163,5 @@
                 and a.create_time <= #{operateLogDto.endTime}
             </if>
         </where>
-        order by a.create_time desc
     </select>
 </mapper>

user_center/src/main/resources/mapper/RoleMenuMapper.xml

@@ -74,11 +74,11 @@
 
     <!-- 批量新增 -->
     <insert id="batchInsert">
-        insert into uims_role_menu(ID, MENU_ID, ROLE_ID,  DATE_CREATE, CREATE_BY, DATE_UPDATE, UPDATE_BY)
+        insert into uims_role_menu(ID, MENU_ID, ROLE_ID, STATUS, DATE_CREATE, CREATE_BY, DATE_UPDATE, UPDATE_BY)
         values
         <foreach collection="roleMenus" item="item" index="index" separator=",">
             (
-            #{item.id}, #{item.menuId}, #{item.roleId},  #{item.dateCreate}, #{item.createBy},
+            #{item.id}, #{item.menuId}, #{item.roleId}, #{item.status} ,#{item.dateCreate}, #{item.createBy},
             #{item.dateUpdate}, #{item.updateBy} )
         </foreach>
     </insert>

user_center/src/main/resources/mapper/TenantMapper.xml

@@ -149,7 +149,6 @@
                 and t.TENANT_NAME like concat('%',#{tenantDto.tenantName},'%')
             </if>
         </where>
-        order by t.dateCreate desc
     </select>
 
     <!-- 生成租户菜单 -->