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
987e3b58
Commit
987e3b58
authored
May 30, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步用户
parent
f62a22f7
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
2 deletions
+6
-2
smart-office-manager/src/main/java/com/mortals/xhx/module/room/model/vo/RoomVo.java
...ain/java/com/mortals/xhx/module/room/model/vo/RoomVo.java
+2
-0
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
.../java/com/mortals/xhx/module/room/web/RoomController.java
+4
-2
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/module/room/model/vo/RoomVo.java
View file @
987e3b58
...
@@ -26,5 +26,7 @@ public class RoomVo extends BaseEntityLong {
...
@@ -26,5 +26,7 @@ public class RoomVo extends BaseEntityLong {
private
List
<
String
>
deviceCodeList
;
private
List
<
String
>
deviceCodeList
;
private
List
<
Long
>
idList
;
}
}
\ No newline at end of file
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
View file @
987e3b58
...
@@ -83,9 +83,11 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
...
@@ -83,9 +83,11 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
RoomDeviceEntity
roomEntity
=
roomDeviceService
.
selectOne
(
new
RoomDeviceQuery
().
deviceCode
(
query
.
getDeviceCode
()));
RoomDeviceEntity
roomEntity
=
roomDeviceService
.
selectOne
(
new
RoomDeviceQuery
().
deviceCode
(
query
.
getDeviceCode
()));
// RoomEntity roomEntity = this.service.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
// RoomEntity roomEntity = this.service.selectOne(new RoomQuery().deviceCode(query.getDeviceCode()));
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
))
{
query
.
setId
(
roomEntity
.
getRoomId
());
query
.
setIdList
(
Arrays
.
asList
(
roomEntity
.
getRoomId
()));
//query.setId(roomEntity.getRoomId());
}
else
{
}
else
{
query
.
setId
(-
1L
);
query
.
setIdList
(
Arrays
.
asList
(-
1L
));
//query.setId(-1L);
}
}
}
}
}
}
...
...
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