|
@@ -52,6 +52,10 @@ public class AppSceneService {
|
|
|
RedisUtil redisUtil;
|
|
RedisUtil redisUtil;
|
|
|
@Autowired
|
|
@Autowired
|
|
|
ISceneCooperationService sceneCooperationService;
|
|
ISceneCooperationService sceneCooperationService;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ ISysRoleService sysRoleService;
|
|
|
|
|
+ @Autowired
|
|
|
|
|
+ IUserRoleService userRoleService;
|
|
|
|
|
|
|
|
@Autowired
|
|
@Autowired
|
|
|
IScenePlusMapper scenePlusMapper;
|
|
IScenePlusMapper scenePlusMapper;
|
|
@@ -77,6 +81,7 @@ public class AppSceneService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
List<String> cooperationNumList = new ArrayList<>();
|
|
List<String> cooperationNumList = new ArrayList<>();
|
|
|
|
|
+ Boolean canDelBut = false;
|
|
|
if(StringUtils.isNotBlank(param.getPhoneNum())){
|
|
if(StringUtils.isNotBlank(param.getPhoneNum())){
|
|
|
User user = userService.getByUserName(param.getPhoneNum());
|
|
User user = userService.getByUserName(param.getPhoneNum());
|
|
|
if(user == null){
|
|
if(user == null){
|
|
@@ -87,6 +92,10 @@ public class AppSceneService {
|
|
|
param.setCooperationNumList(cooperationNumList );
|
|
param.setCooperationNumList(cooperationNumList );
|
|
|
}
|
|
}
|
|
|
param.setUserId(user.getId());
|
|
param.setUserId(user.getId());
|
|
|
|
|
+ SysRole role = userRoleService.getByUserId(user.getId());
|
|
|
|
|
+ if(role != null && "super-admin".equals(role.getRoleType())){
|
|
|
|
|
+ canDelBut = true;
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
Page<AppSceneVo> page = scenePlusMapper.pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
Page<AppSceneVo> page = scenePlusMapper.pageList(new Page<>(param.getPageNum(),param.getPageSize()),param);
|
|
@@ -141,7 +150,9 @@ public class AppSceneService {
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
-
|
|
|
|
|
|
|
+ if(canDelBut){
|
|
|
|
|
+ record.setSceneSourceType(1);
|
|
|
|
|
+ }
|
|
|
}
|
|
}
|
|
|
return PageInfo.PageInfo(page);
|
|
return PageInfo.PageInfo(page);
|
|
|
}
|
|
}
|