From b2dc1a97d2eba90b6637e89b19b8973e071bda53 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=A7=9C=E7=8E=89=E7=90=A6?=
 <7507756+jiang_yuqi@user.noreply.gitee.com>
Date: Fri, 29 Aug 2025 16:37:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E4=BB=A3=E7=A0=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../manage/controller/DevAiProjectDataController.java  | 10 ++++------
 yanzhu-ui-vue3/src/views/system/role/index.vue         |  6 +++---
 2 files changed, 7 insertions(+), 9 deletions(-)

diff --git a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java
index 48430d70..9c0d42c0 100644
--- a/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java
+++ b/yanzhu-modules/yanzhu-manage/src/main/java/com/yanzhu/manage/controller/DevAiProjectDataController.java
@@ -1,6 +1,5 @@
 package com.yanzhu.manage.controller;
 
-import com.yanzhu.common.core.utils.StringUtils;
 import com.yanzhu.common.core.utils.poi.ExcelUtil;
 import com.yanzhu.common.core.web.controller.BaseController;
 import com.yanzhu.common.core.web.domain.AjaxResult;
@@ -9,18 +8,17 @@ import com.yanzhu.common.log.annotation.Log;
 import com.yanzhu.common.log.enums.BusinessType;
 import com.yanzhu.common.redis.service.RedisService;
 import com.yanzhu.common.security.annotation.RequiresPermissions;
-import com.yanzhu.device.domain.DevIotDatas;
 import com.yanzhu.manage.domain.DevAiProjectData;
 import com.yanzhu.manage.service.IDevAiProjectDataService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.bind.annotation.*;
 
 import javax.servlet.http.HttpServletResponse;
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.*;
+import java.util.Date;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 import java.util.concurrent.TimeUnit;
-import java.util.stream.Collectors;
 
 /**
  * AI设备数据Controller
diff --git a/yanzhu-ui-vue3/src/views/system/role/index.vue b/yanzhu-ui-vue3/src/views/system/role/index.vue
index ce8661d5..e1139df3 100644
--- a/yanzhu-ui-vue3/src/views/system/role/index.vue
+++ b/yanzhu-ui-vue3/src/views/system/role/index.vue
@@ -98,7 +98,7 @@
                   v-hasPermi="['system:role:edit']"
                 >修改</el-button>
             </el-col>
-            <el-col :span="1.5">
+            <!-- <el-col :span="1.5">
                 <el-button
                   type="danger"
                   plain
@@ -107,7 +107,7 @@
                   @click="handleDelete"
                   v-hasPermi="['system:role:remove']"
                 >删除</el-button>
-            </el-col>
+            </el-col> -->
             <el-col :span="1.5">
                 <el-button
                   type="warning"
@@ -165,7 +165,7 @@
                   <el-tooltip content="修改" placement="top" v-if="scope.row.roleId !== 1 && (scope.row.roleId !== 2 && isAdmin)">
                     <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" v-hasPermi="['system:role:edit']"></el-button>
                   </el-tooltip>
-                  <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1 && (scope.row.roleId !== 2 && isAdmin)">
+                  <el-tooltip content="删除" placement="top" v-if="scope.row.roleId !== 1 && (scope.row.roleId !== 2 && isAdmin) && scope.row.createBy != 'SYSTEM'">
                     <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" v-hasPermi="['system:role:remove']"></el-button>
                   </el-tooltip>
                   <el-tooltip content="数据权限" placement="top" v-if="scope.row.roleId !== 1 && isAdmin">