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
35957593
Commit
35957593
authored
May 30, 2023
by
赵啸非
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改同步用户
parent
0f18bcbf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
2 additions
and
2 deletions
+2
-2
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
.../java/com/mortals/xhx/module/room/web/RoomController.java
+1
-1
smart-office-manager/src/test/java/com/mortals/httpclient/room/RoomController.http
...test/java/com/mortals/httpclient/room/RoomController.http
+1
-1
No files found.
smart-office-manager/src/main/java/com/mortals/xhx/module/room/web/RoomController.java
View file @
35957593
...
@@ -82,8 +82,8 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
...
@@ -82,8 +82,8 @@ public class RoomController extends BaseCRUDJsonBodyMappingController<RoomServic
super
.
doListBefore
(
query
,
model
,
context
);
super
.
doListBefore
(
query
,
model
,
context
);
if
(!
ObjectUtils
.
isEmpty
(
query
.
getDeviceCode
()))
{
if
(!
ObjectUtils
.
isEmpty
(
query
.
getDeviceCode
()))
{
//根据设备编码 查询房间room
//根据设备编码 查询房间room
query
.
setDeviceCode
(
null
);
RoomDeviceEntity
roomEntity
=
roomDeviceService
.
selectOne
(
new
RoomDeviceQuery
().
deviceCode
(
query
.
getDeviceCode
()));
RoomDeviceEntity
roomEntity
=
roomDeviceService
.
selectOne
(
new
RoomDeviceQuery
().
deviceCode
(
query
.
getDeviceCode
()));
query
.
setDeviceCode
(
null
);
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
))
{
if
(!
ObjectUtils
.
isEmpty
(
roomEntity
))
{
// query.setIdList(Arrays.asList(roomEntity.getRoomId()));
// query.setIdList(Arrays.asList(roomEntity.getRoomId()));
query
.
setId
(
roomEntity
.
getRoomId
());
query
.
setId
(
roomEntity
.
getRoomId
());
...
...
smart-office-manager/src/test/java/com/mortals/httpclient/room/RoomController.http
View file @
35957593
...
@@ -20,7 +20,7 @@ Content-Type: application/json
...
@@ -20,7 +20,7 @@ Content-Type: application/json
{
{
"page":1,
"page":1,
"size":1,
"size":1,
"deviceCode":"
11-22-33-44
"
"deviceCode":"
0E-B7-8C-0F-6E-9B
"
}
}
...
...
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