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
5a443de5
Commit
5a443de5
authored
Nov 01, 2022
by
zhangsen
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
bug xiugai
parent
a1554de0
Show whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
11 additions
and
4 deletions
+11
-4
PointController.java
...join/amos/patrol/business/controller/PointController.java
+11
-4
No files found.
amos-boot-module/amos-boot-module-biz/amos-boot-module-patrol-biz/src/main/java/com/yeejoin/amos/patrol/business/controller/PointController.java
View file @
5a443de5
...
@@ -881,6 +881,7 @@ public class PointController extends AbstractBaseController {
...
@@ -881,6 +881,7 @@ public class PointController extends AbstractBaseController {
downData
.
add
(
new
String
[
0
]);
downData
.
add
(
new
String
[
0
]);
}
}
//责任人
//责任人
if
(!
StringUtils
.
isEmpty
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
()))
{
Object
o
=
jcsFeignClient
.
listCompany
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
Object
o
=
jcsFeignClient
.
listCompany
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
());
List
<
Map
<
String
,
String
>>
personlist
=
(
List
<
Map
<
String
,
String
>>)
o
;
List
<
Map
<
String
,
String
>>
personlist
=
(
List
<
Map
<
String
,
String
>>)
o
;
String
[]
person
=
new
String
[
personlist
.
size
()];
String
[]
person
=
new
String
[
personlist
.
size
()];
...
@@ -892,18 +893,24 @@ public class PointController extends AbstractBaseController {
...
@@ -892,18 +893,24 @@ public class PointController extends AbstractBaseController {
}
else
{
}
else
{
downData
.
add
(
new
String
[
0
]);
downData
.
add
(
new
String
[
0
]);
}
}
}
else
{
downData
.
add
(
new
String
[
0
]);
}
if
(!
StringUtils
.
isEmpty
(
reginParams
.
getPersonIdentity
().
getBizOrgCode
()))
{
//所在建筑
//所在建筑
FeignClientResult
result
=
equipFeign
.
myTreeList
();
FeignClientResult
result
=
equipFeign
.
myTreeList
();
Object
obj
=
result
.
getResult
();
Object
obj
=
result
.
getResult
();
List
<
Map
<
String
,
Object
>>
treeMap
=
(
List
<
Map
<
String
,
Object
>>)
obj
;
List
<
Map
<
String
,
Object
>>
treeMap
=
(
List
<
Map
<
String
,
Object
>>)
obj
;
String
[]
build
=
new
String
[
treeMap
.
size
()];
String
[]
build
=
new
String
[
treeMap
.
size
()];
if
(
CollectionUtils
.
isNotEmpty
(
treeMap
))
{
if
(
CollectionUtils
.
isNotEmpty
(
treeMap
))
{
for
(
int
i
=
0
;
i
<
treeMap
.
size
();
i
++)
{
for
(
int
i
=
0
;
i
<
treeMap
.
size
();
i
++)
{
build
[
i
]
=
treeMap
.
get
(
i
).
get
(
"instanceName"
)+
"@"
+
treeMap
.
get
(
i
).
get
(
"instanceId"
);
build
[
i
]
=
treeMap
.
get
(
i
).
get
(
"instanceName"
)
+
"@"
+
treeMap
.
get
(
i
).
get
(
"instanceId"
);
}
}
}
}
downData
.
add
(
build
);
downData
.
add
(
build
);
}
else
{
downData
.
add
(
new
String
[
0
]);
}
String
[]
downRows
=
{
"2"
,
"3"
,
"4"
,
"8"
,
"11"
,
"12"
,
"13"
,
"14"
};
//下拉的列序号数组(序号从0开始)
String
[]
downRows
=
{
"2"
,
"3"
,
"4"
,
"8"
,
"11"
,
"12"
,
"13"
,
"14"
};
//下拉的列序号数组(序号从0开始)
try
{
try
{
...
...
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