Commit 32efcfdd authored by 赵啸非's avatar 赵啸非

修改同步用户

parent a61062e8
package com.mortals.xhx.module.metting.web; package com.mortals.xhx.module.metting.web;
import cn.hutool.core.date.DateUtil;
import com.alibaba.fastjson.JSON; import com.alibaba.fastjson.JSON;
import com.mortals.framework.exception.AppException; import com.mortals.framework.exception.AppException;
import com.mortals.framework.model.Context; import com.mortals.framework.model.Context;
...@@ -54,9 +55,9 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M ...@@ -54,9 +55,9 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
protected void doListBefore(MettingRecordEntity query, Map<String, Object> model, Context context) throws AppException { protected void doListBefore(MettingRecordEntity query, Map<String, Object> model, Context context) throws AppException {
super.doListBefore(query, model, context); super.doListBefore(query, model, context);
if(ObjectUtils.isEmpty(query.getOrderColList())){ if (ObjectUtils.isEmpty(query.getOrderColList())) {
query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING))); query.setOrderColList(Arrays.asList(new OrderCol("createTime", OrderCol.DESCENDING)));
}else{ } else {
query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING)); query.getOrderColList().add(new OrderCol("createTime", OrderCol.DESCENDING));
} }
...@@ -65,9 +66,11 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M ...@@ -65,9 +66,11 @@ public class MettingRecordController extends BaseCRUDJsonBodyMappingController<M
RoomEntity roomEntity = roomService.selectOne(new RoomQuery().deviceCode(query.getDeviceCode())); RoomEntity roomEntity = roomService.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
if (!ObjectUtils.isEmpty(roomEntity)) { if (!ObjectUtils.isEmpty(roomEntity)) {
query.setRoomId(roomEntity.getId()); query.setRoomId(roomEntity.getId());
}else { } else {
query.setRoomId(-1L); query.setRoomId(-1L);
} }
query.setMeetDateStart(DateUtil.today());
query.setMeetDateEnd(DateUtil.today());
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment