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
ab268e73
Commit
ab268e73
authored
Nov 13, 2020
by
黄奎
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
新增字段
parent
e3e5f855
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
56 additions
and
9 deletions
+56
-9
UserInfo.cs
Edu.Model/CacheModel/UserInfo.cs
+20
-0
RB_Department.cs
Edu.Model/Entity/User/RB_Department.cs
+1
-6
RB_Manager.cs
Edu.Model/Entity/User/RB_Manager.cs
+10
-0
RB_School.cs
Edu.Model/Entity/User/RB_School.cs
+5
-0
RB_Teacher.cs
Edu.Model/Entity/User/RB_Teacher.cs
+10
-0
RB_Department_ViewModel.cs
Edu.Model/ViewModel/User/RB_Department_ViewModel.cs
+5
-0
RB_DepartmentRepository.cs
Edu.Repository/User/RB_DepartmentRepository.cs
+2
-2
UserController.cs
Edu.WebApi/Controllers/User/UserController.cs
+3
-1
No files found.
Edu.Model/CacheModel/UserInfo.cs
View file @
ab268e73
...
...
@@ -74,5 +74,25 @@ namespace Edu.Model.CacheModel
/// 用户头像
/// </summary>
public
string
UserIcon
{
get
;
set
;
}
/// <summary>
/// 部门编号
/// </summary>
public
int
DeptId
{
get
;
set
;
}
/// <summary>
/// 部门名称
/// </summary>
public
string
DeptName
{
get
;
set
;
}
/// <summary>
/// 岗位编号
/// </summary>
public
int
PostId
{
get
;
set
;
}
/// <summary>
/// 岗位名称
/// </summary>
public
string
PostName
{
get
;
set
;
}
}
}
\ No newline at end of file
Edu.Model/Entity/User/RB_Department.cs
View file @
ab268e73
...
...
@@ -21,18 +21,13 @@ namespace Edu.Model.Entity.User
/// </summary>
public
string
DeptName
{
get
;
set
;
}
/// <summary>
/// 部门负责人
/// </summary>
public
int
DeptManager
{
get
;
set
;
}
/// <summary>
/// 部门电话
/// </summary>
public
string
DeptTel
{
get
;
set
;
}
/// <summary>
/// 部门负责人编号
/// 部门负责人编号
【多个逗号分隔】
/// </summary>
public
string
ManagerIds
{
get
;
set
;
}
...
...
Edu.Model/Entity/User/RB_Manager.cs
View file @
ab268e73
...
...
@@ -70,5 +70,15 @@ namespace Edu.Model.Entity.User
/// 角色列表
/// </summary>
public
string
RoleAuth
{
get
;
set
;
}
/// <summary>
/// 部门编号
/// </summary>
public
int
Dept_Id
{
get
;
set
;
}
/// <summary>
/// 岗位编号
/// </summary>
public
int
Post_Id
{
get
;
set
;
}
}
}
Edu.Model/Entity/User/RB_School.cs
View file @
ab268e73
...
...
@@ -80,5 +80,10 @@ namespace Edu.Model.Entity.User
/// 更新时间
/// </summary>
public
DateTime
UpdateTime
{
get
;
set
;
}
/// <summary>
/// 部门编号
/// </summary>
public
int
Dept_Id
{
get
;
set
;
}
}
}
\ No newline at end of file
Edu.Model/Entity/User/RB_Teacher.cs
View file @
ab268e73
...
...
@@ -111,5 +111,15 @@ namespace Edu.Model.Entity.User
/// 教师标签
/// </summary>
public
string
TeachTag
{
get
;
set
;
}
/// <summary>
/// 部门编号
/// </summary>
public
int
Dept_Id
{
get
;
set
;
}
/// <summary>
/// 岗位编号
/// </summary>
public
int
Post_Id
{
get
;
set
;
}
}
}
\ No newline at end of file
Edu.Model/ViewModel/User/RB_Department_ViewModel.cs
View file @
ab268e73
...
...
@@ -28,5 +28,10 @@ namespace Edu.Model.ViewModel.User
/// 修改时间
/// </summary>
public
string
UpdateTimeStr
{
get
{
return
Common
.
ConvertHelper
.
FormatTime
(
this
.
UpdateTime
);
}
}
/// <summary>
/// 集团名称
/// </summary>
public
string
GroupName
{
get
;
set
;
}
}
}
\ No newline at end of file
Edu.Repository/User/RB_DepartmentRepository.cs
View file @
ab268e73
...
...
@@ -26,8 +26,8 @@ namespace Edu.Repository.User
DynamicParameters
parameters
=
new
DynamicParameters
();
StringBuilder
builder
=
new
StringBuilder
();
builder
.
AppendFormat
(
@"
SELECT A.*
FROM rb_department AS A
SELECT A.*
,IFNULL(B.GroupName,'') AS GroupName
FROM rb_department AS A
LEFT JOIN rb_group AS B ON A.Group_Id=B.GId
WHERE 1=1
"
);
if
(
query
!=
null
)
...
...
Edu.WebApi/Controllers/User/UserController.cs
View file @
ab268e73
...
...
@@ -774,6 +774,7 @@ namespace Edu.WebApi.Controllers.User
extModel
.
UpdateBy
=
base
.
UserInfo
.
Id
;
extModel
.
UpdateTime
=
DateTime
.
Now
;
extModel
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
extModel
.
Status
=
Common
.
Enum
.
DateStateEnum
.
Normal
;
bool
flag
=
departmentModule
.
SetDepartmentModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
...
...
@@ -811,7 +812,7 @@ namespace Edu.WebApi.Controllers.User
/// </summary>
/// <returns></returns>
[
HttpPost
]
public
ApiResult
GetPostPage
()
public
ApiResult
GetPostPage
List
()
{
var
pageModel
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
ResultPageModel
>(
RequestParm
.
Msg
.
ToString
());
var
query
=
Common
.
Plugin
.
JsonHelper
.
DeserializeObject
<
RB_Post_ViewModel
>(
RequestParm
.
Msg
.
ToString
());
...
...
@@ -860,6 +861,7 @@ namespace Edu.WebApi.Controllers.User
extModel
.
UpdateBy
=
base
.
UserInfo
.
Id
;
extModel
.
UpdateTime
=
DateTime
.
Now
;
extModel
.
Group_Id
=
base
.
UserInfo
.
Group_Id
;
extModel
.
Status
=
Common
.
Enum
.
DateStateEnum
.
Normal
;
bool
flag
=
postModule
.
SetPostModule
(
extModel
);
return
flag
?
ApiResult
.
Success
()
:
ApiResult
.
Failed
();
}
...
...
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