bug修复

This commit is contained in:
kerwincui
2022-06-17 00:31:48 +08:00
parent 19a6b28cb8
commit cb338037d2
4 changed files with 28 additions and 16 deletions

View File

@@ -84,12 +84,15 @@ public class CategoryServiceImpl implements ICategoryService
@Override @Override
public int insertCategory(Category category) public int insertCategory(Category category)
{ {
// 判断是否为管理员
category.setIsSys(1);
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
List<SysRole> roles=user.getRoles(); List<SysRole> roles=user.getRoles();
if(roles==null || roles.size()==0) {return 0;} for(int i=0;i<roles.size();i++){
// 系统管理员 if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){ category.setIsSys(0);
category.setIsSys(1); break;
}
} }
category.setTenantId(user.getUserId()); category.setTenantId(user.getUserId());
category.setTenantName(user.getUserName()); category.setTenantName(user.getUserName());

View File

@@ -76,12 +76,15 @@ public class FirmwareServiceImpl implements IFirmwareService
@Override @Override
public int insertFirmware(Firmware firmware) public int insertFirmware(Firmware firmware)
{ {
// 判断是否为管理员
firmware.setIsSys(1);
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
List<SysRole> roles=user.getRoles(); List<SysRole> roles=user.getRoles();
if(roles==null || roles.size()==0) {return 0;} for(int i=0;i<roles.size();i++){
// 系统管理员 if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){ firmware.setIsSys(0);
firmware.setIsSys(1); break;
}
} }
firmware.setTenantId(user.getUserId()); firmware.setTenantId(user.getUserId());
firmware.setTenantName(user.getUserName()); firmware.setTenantName(user.getUserName());

View File

@@ -99,12 +99,15 @@ public class ProductServiceImpl implements IProductService
@Override @Override
public Product insertProduct(Product product) public Product insertProduct(Product product)
{ {
// 判断是否为管理员
product.setIsSys(1);
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
List<SysRole> roles=user.getRoles(); List<SysRole> roles=user.getRoles();
if(roles==null || roles.size()==0) {return null;} for(int i=0;i<roles.size();i++){
// 系统管理员 if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){ product.setIsSys(0);
product.setIsSys(1); break;
}
} }
// mqtt账号密码 // mqtt账号密码
product.setMqttAccount("wumei-smart"); product.setMqttAccount("wumei-smart");

View File

@@ -65,12 +65,15 @@ public class ThingsModelTemplateServiceImpl implements IThingsModelTemplateServi
@Override @Override
public int insertThingsModelTemplate(ThingsModelTemplate thingsModelTemplate) public int insertThingsModelTemplate(ThingsModelTemplate thingsModelTemplate)
{ {
// 判断是否为管理员
thingsModelTemplate.setIsSys(1);
SysUser user = getLoginUser().getUser(); SysUser user = getLoginUser().getUser();
List<SysRole> roles=user.getRoles(); List<SysRole> roles=user.getRoles();
if(roles==null || roles.size()==0) {return 0;} for(int i=0;i<roles.size();i++){
// 系统管理员 if(roles.get(i).getRoleKey().equals("tenant") || roles.get(i).getRoleKey().equals("general")){
if(roles.stream().anyMatch(a->a.getRoleKey().equals("admin"))){ thingsModelTemplate.setIsSys(0);
thingsModelTemplate.setIsSys(1); break;
}
} }
thingsModelTemplate.setTenantId(user.getUserId()); thingsModelTemplate.setTenantId(user.getUserId());
thingsModelTemplate.setTenantName(user.getUserName()); thingsModelTemplate.setTenantName(user.getUserName());