Imdroid/security-monitor
2
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

1、修改非SAAS用户登录后，首页查询异常设备的bug

Browse Source
This commit is contained in:
weidong 2025-04-30 15:59:25 +08:00
parent 9bbbbde78c
commit 7f66b1ae7b
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
sec-beidou/src/main/java/com/imdroid/beidou/controller/IndexController.java
View File

@ -114,12 +114,23 @@ public class IndexController extends BasicController{
public JSONObject list(HttpSession session, Integer page, Integer limit) {
Page pageable = new Page<>(page == null ? 1 : page, limit == null ? 10 : limit);
MPJQueryWrapper<GnssStatus> queryWrapper = new MPJQueryWrapper<>();
queryWrapper.selectAll(GnssStatus.class)
.select("d.name as name","d.devicetype as devicetype","d.project_id as project_id")
.leftJoin("gnssdevices d on t.deviceid = d.deviceid")
.ne("d.tenantid",Tenant.SAAS_PROVIDER_ID)
.eq("opmode",GnssDevice.OP_MODE_USE)
.orderByDesc("updatetime");
Integer tenantId = getTenantId(session);
if(tenantId == Tenant.SAAS_PROVIDER_ID) {
queryWrapper.selectAll(GnssStatus.class)
.select("d.name as name", "d.devicetype as devicetype", "d.project_id as project_id")
.leftJoin("gnssdevices d on t.deviceid = d.deviceid")
.ne("d.tenantid", Tenant.SAAS_PROVIDER_ID)
.eq("opmode", GnssDevice.OP_MODE_USE)
.orderByDesc("updatetime");
}
else{
queryWrapper.selectAll(GnssStatus.class)
.select("d.name as name", "d.devicetype as devicetype", "d.project_id as project_id")
.leftJoin("gnssdevices d on t.deviceid = d.deviceid")
.eq("d.tenantid", tenantId)
.eq("opmode", GnssDevice.OP_MODE_USE)
.orderByDesc("updatetime");
}
String query = (String) session.getAttribute("query");
if(query != null){