Skip to content
Toggle navigation
Toggle navigation
This project
Loading...
Sign in
csbr-daop
/
ms-data-circulation-portal-service
Go to a project
Toggle navigation
Toggle navigation pinning
Projects
Groups
Snippets
Help
Project
Activity
Repository
Pipelines
Graphs
Issues
0
Merge Requests
0
Wiki
Network
Create a new issue
Builds
Commits
Issue Boards
Files
Commits
Network
Compare
Branches
Tags
6f327a2f
authored
2025-03-14 16:12:25 +0800
by
xiaojie
Browse Files
Options
Browse Files
Tag
Download
Email Patches
Plain Diff
【数据资产】
1、企业信息-根据登陆账号查询详情
1 parent
4c1f43f9
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
2 additions
and
1 deletions
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
src/main/java/com/csbr/qingcloud/portal/service/impl/EnterpriseServiceImpl.java
View file @
6f327a2
...
...
@@ -557,12 +557,13 @@ public class EnterpriseServiceImpl extends FlowAbstractImpl implements Enterpris
return
enterpriseRSVO
;
}
// 判断
变更历史数据 最新是否驳回
// 判断
最新变更数据是否是审批中 审批中显示最新数据 驳回或通过显示最新一次审批通过数据
MfEnterpriseChangeApprove
mfEnterpriseChangeApprove
=
approveList
.
get
(
0
);
if
(
ApprovalStateEnum
.
CHECKING
.
getValue
().
equals
(
mfEnterpriseChangeApprove
.
getBizApproveState
()))
{
enterpriseRSVO
=
csbrBeanUtil
.
convert
(
mfEnterpriseChangeApprove
,
EnterpriseRSVO
.
class
);
}
// 只显示审批通过的变更历史
List
<
MfEnterpriseChangeApprove
>
passChangeApproves
=
approveList
.
stream
().
filter
(
item
->
ApprovalStateEnum
.
PASSED
.
getValue
().
equals
(
item
.
getBizApproveState
())).
toList
();
if
(
ObjectUtils
.
isNotEmpty
(
passChangeApproves
))
{
List
<
ChangeApproveBean
>
beanList
=
getChangeBeanList
(
passChangeApproves
);
...
...
Write
Preview
Styling with
Markdown
is supported
Attach a file
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 post a comment