Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
A
amos-boot-biz
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
项目统一框架
amos-boot-biz
Commits
70e87bb8
Commit
70e87bb8
authored
Nov 03, 2021
by
tangwei
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
修改bug
parent
d7c7991a
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
5 deletions
+6
-5
EquipFeignClient.java
...n/amos/boot/module/common/api/feign/EquipFeignClient.java
+2
-1
CommandController.java
...boot/module/command/biz/controller/CommandController.java
+4
-4
No files found.
amos-boot-module/amos-boot-module-api/amos-boot-module-common-api/src/main/java/com/yeejoin/amos/boot/module/common/api/feign/EquipFeignClient.java
View file @
70e87bb8
...
@@ -85,7 +85,8 @@ public interface EquipFeignClient {
...
@@ -85,7 +85,8 @@ public interface EquipFeignClient {
@RequestParam
String
code
,
@RequestParam
String
code
,
@RequestParam
String
pageNum
,
@RequestParam
String
pageNum
,
@RequestParam
String
pageSize
,
@RequestParam
String
pageSize
,
@RequestParam
Long
id
);
@RequestParam
Long
id
,
@RequestParam
Boolean
isNo
);
...
...
amos-boot-module/amos-boot-module-biz/amos-boot-module-command-biz/src/main/java/com/yeejoin/amos/boot/module/command/biz/controller/CommandController.java
View file @
70e87bb8
...
@@ -1334,10 +1334,10 @@ public class CommandController extends BaseController {
...
@@ -1334,10 +1334,10 @@ public class CommandController extends BaseController {
Long
id
=
null
;
Long
id
=
null
;
//获取用户已绑定车辆id、
//获取用户已绑定车辆id、
UserCar
userCar
=
userCarService
.
selectByAmosUserId
(
Long
.
valueOf
(
agencyUserModel
.
getUserId
()));
UserCar
userCar
=
userCarService
.
selectByAmosUserId
(
Long
.
valueOf
(
agencyUserModel
.
getUserId
()));
if
(
isNo
!=
null
&&
isNo
){
id
=
userCar
!=
null
?
userCar
.
getCarId
():
null
;
id
=
userCar
!=
null
?
userCar
.
getCarId
():
null
;
}
ResponseModel
<
Object
>
data
=
equipFeignClient
.
equipmentCarList
(
teamId
,
name
,
code
,
pageNum
,
pageSize
,
id
);
ResponseModel
<
Object
>
data
=
equipFeignClient
.
equipmentCarList
(
teamId
,
name
,
code
,
pageNum
,
pageSize
,
id
,
isNo
);
Map
map
=
new
HashMap
();
Map
map
=
new
HashMap
();
map
.
put
(
"select"
,
userCar
!=
null
?
userCar
.
getCarId
():
null
);
map
.
put
(
"select"
,
userCar
!=
null
?
userCar
.
getCarId
():
null
);
map
.
put
(
"data"
,
data
!=
null
?
data
.
getResult
():
null
);
map
.
put
(
"data"
,
data
!=
null
?
data
.
getResult
():
null
);
...
...
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