From cb338037d208b2045cea088754306b62ae1501a9 Mon Sep 17 00:00:00 2001
From: kerwincui <164770707@qq.com>
Date: Fri, 17 Jun 2022 00:31:48 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ruoyi/iot/service/impl/CategoryServiceImpl.java   | 11 +++++++----
 .../ruoyi/iot/service/impl/FirmwareServiceImpl.java   | 11 +++++++----
 .../ruoyi/iot/service/impl/ProductServiceImpl.java    | 11 +++++++----
 .../service/impl/ThingsModelTemplateServiceImpl.java  | 11 +++++++----
 4 files changed, 28 insertions(+), 16 deletions(-)

diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java
index 52694798..f30979ae 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/CategoryServiceImpl.java
@@ -84,12 +84,15 @@ public class CategoryServiceImpl implements ICategoryService
     @Override
     public int insertCategory(Category category)
     {
+        // 判断是否为管理员
+        category.setIsSys(1);
         SysUser user = getLoginUser().getUser();
         List<SysRole> roles=user.getRoles();
-        if(roles==null || roles.size()==0) {return 0;}
-        // 系统管理员
-        if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){
-            category.setIsSys(1);
+        for(int i=0;i<roles.size();i++){
+            if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
+                category.setIsSys(0);
+                break;
+            }
         }
         category.setTenantId(user.getUserId());
         category.setTenantName(user.getUserName());
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java
index ecf609c1..87667814 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/FirmwareServiceImpl.java
@@ -76,12 +76,15 @@ public class FirmwareServiceImpl implements IFirmwareService
     @Override
     public int insertFirmware(Firmware firmware)
     {
+        // 判断是否为管理员
+        firmware.setIsSys(1);
         SysUser user = getLoginUser().getUser();
         List<SysRole> roles=user.getRoles();
-        if(roles==null || roles.size()==0) {return 0;}
-        // 系统管理员
-        if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){
-            firmware.setIsSys(1);
+        for(int i=0;i<roles.size();i++){
+            if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
+                firmware.setIsSys(0);
+                break;
+            }
         }
         firmware.setTenantId(user.getUserId());
         firmware.setTenantName(user.getUserName());
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java
index 58f2a38a..f90b91ec 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ProductServiceImpl.java
@@ -99,12 +99,15 @@ public class ProductServiceImpl implements IProductService
     @Override
     public Product insertProduct(Product product)
     {
+        // 判断是否为管理员
+        product.setIsSys(1);
         SysUser user = getLoginUser().getUser();
         List<SysRole> roles=user.getRoles();
-        if(roles==null || roles.size()==0) {return null;}
-        // 系统管理员
-        if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){
-            product.setIsSys(1);
+        for(int i=0;i<roles.size();i++){
+            if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
+                product.setIsSys(0);
+                break;
+            }
         }
         // mqtt账号密码
         product.setMqttAccount("wumei-smart");
diff --git a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java
index c5997eeb..5dc9c92a 100644
--- a/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java
+++ b/springboot/wumei-iot/src/main/java/com/ruoyi/iot/service/impl/ThingsModelTemplateServiceImpl.java
@@ -65,12 +65,15 @@ public class ThingsModelTemplateServiceImpl implements IThingsModelTemplateServi
     @Override
     public int insertThingsModelTemplate(ThingsModelTemplate thingsModelTemplate)
     {
+        // 判断是否为管理员
+        thingsModelTemplate.setIsSys(1);
         SysUser user = getLoginUser().getUser();
         List<SysRole> roles=user.getRoles();
-        if(roles==null || roles.size()==0) {return 0;}
-        // 系统管理员
-        if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){
-            thingsModelTemplate.setIsSys(1);
+        for(int i=0;i<roles.size();i++){
+            if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
+                thingsModelTemplate.setIsSys(0);
+                break;
+            }
         }
         thingsModelTemplate.setTenantId(user.getUserId());
         thingsModelTemplate.setTenantName(user.getUserName());