Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
Education
Project
Project
Details
Activity
Releases
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
黄奎
Education
Commits
ed2d5887
Commit
ed2d5887
authored
3 years ago
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
857114d7
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
8 additions
and
3 deletions
+8
-3
MarketConsultantModule.cs
Edu.Module.Customer/MarketConsultantModule.cs
+7
-2
UserCenterController.cs
Edu.WebApi/Controllers/User/UserCenterController.cs
+1
-1
No files found.
Edu.Module.Customer/MarketConsultantModule.cs
View file @
ed2d5887
...
...
@@ -896,7 +896,7 @@ namespace Edu.Module.Customer
/// <param name="EndTime">结束时间</param>
/// <param name="qEmpIds">员工编号</param>
/// <returns></returns>
public
List
<
object
>
MarketChannelStudentStaticModule
(
string
StartTime
,
string
EndTime
,
string
qEmpIds
)
public
List
<
object
>
MarketChannelStudentStaticModule
(
string
StartTime
,
string
EndTime
,
string
qEmpIds
,
bool
isHaveAuth
=
false
)
{
List
<
object
>
list
=
new
List
<
object
>();
var
empList
=
accountRepository
.
GetEmployeeListRepository
(
new
Employee_ViewModel
()
...
...
@@ -921,11 +921,16 @@ namespace Edu.Module.Customer
var
tempList
=
dataList
?.
Where
(
qitem
=>
qitem
.
CreateBy
==
eItem
.
Id
)?.
ToList
();
//包含的数据
string
singleIds
=
""
;
string
authId
=
"1"
;
if
(
isHaveAuth
)
{
authId
=
"2"
;
}
if
(
channelList
!=
null
&&
channelList
.
Count
>
0
)
{
foreach
(
var
item
in
channelList
)
{
if
(
item
.
StaticTypeList
!=
null
&&
item
.
StaticTypeList
.
Contains
(
"1"
))
if
(
item
.
StaticTypeList
!=
null
&&
item
.
StaticTypeList
.
Contains
(
authId
))
{
singleIds
+=
","
+
item
.
Id
;
var
channelTempList
=
tempList
?.
Where
(
qitem
=>
qitem
.
CreateType
==
StuCreateTypeEnum
.
EmployeeInput
&&
qitem
.
StuChannel
==
item
.
Id
)?.
ToList
();
...
...
This diff is collapsed.
Click to expand it.
Edu.WebApi/Controllers/User/UserCenterController.cs
View file @
ed2d5887
...
...
@@ -2791,7 +2791,7 @@ namespace Edu.WebApi.Controllers.User
{
qEmpIds
=
string
.
Join
(
","
,
empList
);
}
var
data
=
marketConsultantModule
.
MarketChannelStudentStaticModule
(
startTime
,
endTime
,
qEmpIds
);
var
data
=
marketConsultantModule
.
MarketChannelStudentStaticModule
(
startTime
,
endTime
,
qEmpIds
,
isHaveAuth
:
base
.
CheckUserActionAuth
(
"Query_MarketConsultant"
)
);
return
ApiResult
.
Success
(
data
:
data
);
}
...
...
This diff is collapsed.
Click to expand it.
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