Guwan
/
cqyt
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

v3.0.5 

1.修改小程序端跨运营商无法显示开门记录的bug
This commit is contained in:
gaoben 2021-11-08 14:18:03 +08:00
parent 4d60ca38aa
commit bc8cb2a220
1 changed files with 35 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
shapelight-admin/src/main/java/net/shapelight/modules/app/controller/AppInfoApiController.java
View File

@ -280,8 +280,9 @@ public class AppInfoApiController {
} }
AppUserScopeEntity scope = appUserScopeService.getById(user.getCurrentScopeId()); AppUserScopeEntity scope = appUserScopeService.getById(user.getCurrentScopeId());
params.put("tenantId",user.getTenantId()); TenCellEntity cellEntity = tenCellService.getById(scope.getCellId());
if(cellEntity!=null){
params.put("tenantId",cellEntity.getTenantId());
int during = Integer.parseInt((String)params.get("during")); int during = Integer.parseInt((String)params.get("during"));
String recordTimeStart = null; String recordTimeStart = null;
String recordTimeEnd = null; String recordTimeEnd = null;
@ -291,7 +292,7 @@ public class AppInfoApiController {
}else if(during == 1){ //本周 }else if(during == 1){ //本周
recordTimeStart = MyDateUtils.getCurrentWeekStartTime(); recordTimeStart = MyDateUtils.getCurrentWeekStartTime();
recordTimeEnd = MyDateUtils.getCurrentWeekEndTime(); recordTimeEnd = MyDateUtils.getCurrentWeekEndTime();
}else if(during == 1){ //本月 }else if(during == 2){ //本月
recordTimeStart = MyDateUtils.getCurrentMonthStartTime(); recordTimeStart = MyDateUtils.getCurrentMonthStartTime();
recordTimeEnd = MyDateUtils.getCurrentMonthEndTime(); recordTimeEnd = MyDateUtils.getCurrentMonthEndTime();
} }
@ -315,6 +316,8 @@ public class AppInfoApiController {
PageUtils page = tenRecordService.queryPageRoomRecord(params); PageUtils page = tenRecordService.queryPageRoomRecord(params);
return R.ok().put("data", page); return R.ok().put("data", page);
} }
}
return R.ok().put("data",new PageUtils(new ArrayList<>(),0,0,0)); return R.ok().put("data",new PageUtils(new ArrayList<>(),0,0,0));
} }