Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Contribute to GitLab
Sign in / Register
Toggle navigation
D
dsk-cr20g
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
Administrator
dsk-cr20g
Commits
f55ed098
Commit
f55ed098
authored
Aug 04, 2023
by
huangjie
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'dev20230707' of
http://192.168.60.201/root/dsk-operate-sys
into dev20230707
parents
418e9593
54c72851
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
1 addition
and
1 deletion
+1
-1
EnterpriseService.java
...ain/java/com/dsk/system/dskService/EnterpriseService.java
+1
-1
No files found.
dsk-system/src/main/java/com/dsk/system/dskService/EnterpriseService.java
View file @
f55ed098
...
@@ -416,7 +416,7 @@ public class EnterpriseService {
...
@@ -416,7 +416,7 @@ public class EnterpriseService {
result
.
put
(
"companyId"
,
MapUtil
.
getInt
(
BeanUtil
.
beanToMap
(
map
.
get
(
"data"
)),
"jskEid"
));
result
.
put
(
"companyId"
,
MapUtil
.
getInt
(
BeanUtil
.
beanToMap
(
map
.
get
(
"data"
)),
"jskEid"
));
}
}
if
(!
ObjectUtil
.
isEmpty
(
result
.
get
(
"companyId"
)))
{
if
(!
ObjectUtil
.
isEmpty
(
result
.
get
(
"companyId"
)))
{
R
res
=
this
.
getUipIdByCid
(
new
ArrayList
<>(
MapUtils
.
getInteger
(
result
,
"companyId"
)));
R
res
=
this
.
getUipIdByCid
(
Collections
.
singletonList
(
MapUtils
.
getInteger
(
result
,
"companyId"
)));
if
(!
ObjectUtils
.
isEmpty
(
res
.
getData
()))
{
if
(!
ObjectUtils
.
isEmpty
(
res
.
getData
()))
{
List
<
Map
<
String
,
Object
>>
data
=
(
List
<
Map
<
String
,
Object
>>)
res
.
getData
();
List
<
Map
<
String
,
Object
>>
data
=
(
List
<
Map
<
String
,
Object
>>)
res
.
getData
();
result
.
put
(
"uipId"
,
MapUtil
.
getStr
(
BeanUtil
.
beanToMap
(
data
.
get
((
0
))),
"uipId"
));
result
.
put
(
"uipId"
,
MapUtil
.
getStr
(
BeanUtil
.
beanToMap
(
data
.
get
((
0
))),
"uipId"
));
...
...
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