Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
S
smart-office-platform
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
赵啸非
smart-office-platform
Commits
32efcfdd
Commit
32efcfdd
authored
May 29, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步用户
parent
a61062e8
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java
...rtals/xhx/module/metting/web/MettingRecordController.java
+6
-3
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/module/metting/web/MettingRecordController.java
View file @
32efcfdd
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
());
}
}
}
}
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment