|
@@ -239,7 +239,7 @@ public class TAdminController {
|
|
query.eq(TAdmin::getParentId, parentId);
|
|
query.eq(TAdmin::getParentId, parentId);
|
|
query.eq(TAdmin::getId, param.getId());
|
|
query.eq(TAdmin::getId, param.getId());
|
|
List<TAdmin> list = tAdminService.list(query);
|
|
List<TAdmin> list = tAdminService.list(query);
|
|
- if (list.size() > 0) {
|
|
|
|
|
|
+ if (!list.isEmpty()) {
|
|
TAdmin admin = list.get(0);
|
|
TAdmin admin = list.get(0);
|
|
// 管理的机器 需要再建立一个关系表 type区分全部还是部分
|
|
// 管理的机器 需要再建立一个关系表 type区分全部还是部分
|
|
String equipmentIds = param.getEquipmentIds();
|
|
String equipmentIds = param.getEquipmentIds();
|
|
@@ -267,7 +267,7 @@ public class TAdminController {
|
|
LambdaQueryWrapper<SysUserRole> query1 = Wrappers.lambdaQuery();
|
|
LambdaQueryWrapper<SysUserRole> query1 = Wrappers.lambdaQuery();
|
|
query1.eq(SysUserRole::getUserId, admin.getId());
|
|
query1.eq(SysUserRole::getUserId, admin.getId());
|
|
List<SysUserRole> list1 = sysUserRoleService.list(query1);
|
|
List<SysUserRole> list1 = sysUserRoleService.list(query1);
|
|
- if (list1.size() > 0) {
|
|
|
|
|
|
+ if (!list1.isEmpty()) {
|
|
for (SysUserRole sysUserRole : list1) {
|
|
for (SysUserRole sysUserRole : list1) {
|
|
sysUserRoleService.removeById(sysUserRole.getId());
|
|
sysUserRoleService.removeById(sysUserRole.getId());
|
|
}
|
|
}
|
|
@@ -414,6 +414,7 @@ public class TAdminController {
|
|
}
|
|
}
|
|
addLoginUserParam.setRoleName(roleName.toString());
|
|
addLoginUserParam.setRoleName(roleName.toString());
|
|
addLoginUserParam.setRoleList(ids);
|
|
addLoginUserParam.setRoleList(ids);
|
|
|
|
+ addLoginUserParam.setType(admin.getType());
|
|
returnList.add(addLoginUserParam);
|
|
returnList.add(addLoginUserParam);
|
|
}
|
|
}
|
|
|
|
|