Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
M
mall.oytour.com
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
黄奎
mall.oytour.com
Commits
838b654d
Commit
838b654d
authored
May 19, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
页面修改
parent
b5090a6e
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
58 additions
and
2 deletions
+58
-2
RB_Employee.cs
Mall.Model/Entity/User/RB_Employee.cs
+5
-0
RB_Role.cs
Mall.Model/Entity/User/RB_Role.cs
+10
-0
RB_Employee_Extend.cs
Mall.Model/Extend/User/RB_Employee_Extend.cs
+11
-1
RB_Role_Extend.cs
Mall.Model/Extend/User/RB_Role_Extend.cs
+17
-0
EmployeeController.cs
Mall.WebApi/Controllers/User/EmployeeController.cs
+15
-1
No files found.
Mall.Model/Entity/User/RB_Employee.cs
View file @
838b654d
...
...
@@ -83,5 +83,10 @@ namespace Mall.Model.Entity.User
get
;
set
;
}
/// <summary>
/// 创建时间
/// </summary>
public
DateTime
CreateDate
{
get
;
set
;
}
}
}
Mall.Model/Entity/User/RB_Role.cs
View file @
838b654d
...
...
@@ -76,5 +76,15 @@ namespace Mall.Model.Entity.User
get
;
set
;
}
/// <summary>
/// 创建时间
/// </summary>
public
DateTime
CreateDate
{
get
;
set
;
}
/// <summary>
/// 创建人
/// </summary>
public
int
CreateBy
{
get
;
set
;
}
}
}
Mall.Model/Extend/User/RB_Employee_Extend.cs
View file @
838b654d
...
...
@@ -13,6 +13,16 @@ namespace Mall.Model.Entity.User
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Employee_Extend
:
Model
.
Entity
.
User
.
RB_Employee
{
/// <summary>
/// 创建时间字符串
/// </summary>
public
string
CreateDateStr
{
get
{
string
str
=
""
;
str
=
Convert
.
ToDateTime
(
this
.
CreateDate
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
return
str
;
}
}
}
}
\ No newline at end of file
Mall.Model/Extend/User/RB_Role_Extend.cs
View file @
838b654d
...
...
@@ -13,5 +13,22 @@ namespace Mall.Model.Entity.User
[
DB
(
ConnectionName
=
"DefaultConnection"
)]
public
class
RB_Role_Extend
:
Model
.
Entity
.
User
.
RB_Role
{
/// <summary>
/// 创建时间字符串
/// </summary>
public
string
CreateDateStr
{
get
{
string
str
=
""
;
str
=
Convert
.
ToDateTime
(
this
.
CreateDate
).
ToString
(
"yyyy-MM-dd HH:mm:ss"
);
return
str
;
}
}
/// <summary>
/// 创建人
/// </summary>
public
string
CreateByName
{
get
;
set
;
}
}
}
\ No newline at end of file
Mall.WebApi/Controllers/User/EmployeeController.cs
View file @
838b654d
...
...
@@ -42,6 +42,16 @@ namespace Mall.WebApi.Controllers.User
query
.
MallBaseId
=
RequestParm
.
MallBaseId
;
query
.
TenantId
=
RequestParm
.
TenantId
;
var
list
=
module
.
GetRolePageListModule
(
pageModel
.
pageIndex
,
pageModel
.
pageSize
,
out
long
rowsCount
,
query
);
if
(
list
!=
null
&&
list
.
Count
>
0
)
{
foreach
(
var
item
in
list
)
{
if
(
item
.
CreateBy
>
0
)
{
item
.
CreateByName
=
UserReidsCache
.
GetUserLoginInfo
(
item
.
CreateBy
)?.
Account
??
""
;
}
}
}
pageModel
.
count
=
Convert
.
ToInt32
(
rowsCount
);
pageModel
.
pageData
=
list
;
return
ApiResult
.
Success
(
data
:
pageModel
);
...
...
@@ -70,6 +80,9 @@ namespace Mall.WebApi.Controllers.User
extModel
.
Status
=
0
;
extModel
.
MallBaseId
=
RequestParm
.
MallBaseId
;
extModel
.
TenantId
=
RequestParm
.
TenantId
;
Int32
.
TryParse
(
RequestParm
.
uid
,
out
int
Uid
);
extModel
.
CreateBy
=
Uid
;
extModel
.
CreateDate
=
DateTime
.
Now
;
var
flag
=
module
.
SetRoleModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
...
...
@@ -140,6 +153,7 @@ namespace Mall.WebApi.Controllers.User
extModel
.
Status
=
0
;
extModel
.
MallBaseId
=
RequestParm
.
MallBaseId
;
extModel
.
TenantId
=
RequestParm
.
TenantId
;
extModel
.
CreateDate
=
DateTime
.
Now
;
var
flag
=
module
.
SetEmployeeModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
...
...
@@ -169,7 +183,7 @@ namespace Mall.WebApi.Controllers.User
}
#
endregion
#
region
员工管理
#
region
员工
配置
管理
/// <summary>
...
...
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