Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
P
performance
Overview
Overview
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
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
zry
performance
Commits
91f49dee
Commit
91f49dee
authored
May 31, 2023
by
ruyun.zhang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
显示设置
parent
e5b8203d
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
9 additions
and
5 deletions
+9
-5
performance/Performance.DtoModels/Enum.cs
+1
-0
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
+8
-5
No files found.
performance/Performance.DtoModels/Enum.cs
View file @
91f49dee
...
...
@@ -218,6 +218,7 @@ public enum Title
}
public
enum
DisplayRule
{
始终隐藏
,
始终显示
,
下发显示
,
}
...
...
performance/Performance.Services/ComputeService.UniteDeptDetail.cs
View file @
91f49dee
...
...
@@ -330,14 +330,17 @@ public UniteDeptDetailResponse UniteDeptDetail(int allotId, UnitType unitType, s
// 备注
detail
.
Remark
=
allot
.
ShowFormula
==
1
?
cfg
?.
Remark
:
null
;
// 只对科室查看时右侧并且未下发隐藏内容
if
(
userInfo
.
IsSecondAdmin
&&
detail
.
Type
==
(
int
)
UniteDept
.
Type
.
右侧收缩
&&
cfg
?.
Display
==
UniteDept
.
DisplayRule
.
下发显示
.
ToString
()
&&
allot
.
States
!=
(
int
)
AllotStates
.
绩效下发
&&
allot
.
States
!=
(
int
)
AllotStates
.
归档
)
if
(
cfg
?.
Display
==
UniteDept
.
DisplayRule
.
始终隐藏
.
ToString
())
{
detail
.
Display
=
false
;
}
else
if
(
cfg
?.
Display
==
UniteDept
.
DisplayRule
.
下发显示
.
ToString
())
{
if
(
userInfo
.
IsSecondAdmin
&&
detail
.
Type
==
(
int
)
UniteDept
.
Type
.
右侧收缩
&&
allot
.
States
!=
(
int
)
AllotStates
.
绩效下发
&&
allot
.
States
!=
(
int
)
AllotStates
.
归档
)
{
detail
.
Display
=
false
;
}
}
}
response
.
DetailItems
=
response
.
DetailItems
.
OrderBy
(
w
=>
w
.
Type
).
ThenBy
(
w
=>
w
.
Sort
).
ToList
();
...
...
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