From fe5906071222d525a650a1b4df2c4b7119e11eca Mon Sep 17 00:00:00 2001
From: du <1725534722@qq.com>
Date: Fri, 22 Nov 2024 23:08:28 +0800
Subject: [PATCH] =?UTF-8?q?=E9=94=99=E8=AF=AF=E5=9B=9E=E6=BB=9A?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/com/ruoyi/tc/controller/AssetCurrentController.java     | 1 +
 .../src/main/java/com/ruoyi/tc/controller/UnitController.java    | 1 +
 ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java  | 1 -
 ruoyi-admin/src/main/resources/mapper/UnitMapper.xml             | 1 +
 4 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
index 6146cca..005bee5 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/AssetCurrentController.java
@@ -254,6 +254,7 @@ public class AssetCurrentController extends BaseController {
     /**
      * 导入现有资产
      */
+    @Transactional(rollbackFor = Exception.class)
     @PreAuthorize("@ss.hasAnyRoles('admin,common')")
     @ApiOperation(value = "导入现有资产")
     @PostMapping(value = "/import", consumes = "multipart/form-data")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java
index 6f8375b..89cb3c4 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/controller/UnitController.java
@@ -77,6 +77,7 @@ public class UnitController {
     /**
      * 单位导入
      */
+    @Transactional(rollbackFor = Exception.class)
     @ApiOperation(value = "单位导入")
     @Log(title = "单位导入", businessType = BusinessType.IMPORT)
     @PostMapping("/importData")
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
index df21a0a..48edb67 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/tc/entity/AssetCurrent.java
@@ -37,7 +37,6 @@ public class AssetCurrent extends BaseClass implements Serializable {
     */
     @NotBlank
     @Size(max= 100,message="系统名称长度不能超过100")
-    @Excel(name = "*系统名称",sort = 2,width = 40,required = true)
     @ApiModelProperty("系统名称")
     private String xtmc;
     /**
diff --git a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
index a46662f..0dc309f 100644
--- a/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
+++ b/ruoyi-admin/src/main/resources/mapper/UnitMapper.xml
@@ -97,6 +97,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
                 and a.user_name like concat('%',#{req.userName},'%')
             </if>
         </where>
+        order by create_time desc
     </select>
     <select id="getById" parameterType="unit" resultMap="unitResult">
         select a.*,c.*,e.* from unit_info a