perf👌 : 岗位、角色功能改造

This commit is contained in:
wenjianzhang committed 2021-01-16 21:46:57 +08:00
1 parent ad42b6489a
commit 792c8874aa
21 files changed
+1575 -103

No files matched your search

+38 -4
View File
@@ -3,7 +3,6 @@ package sys_dept
import (
"github.com/gin-gonic/gin"
"go-admin/app/admin/models"
"go-admin/app/admin/service"
"go-admin/app/admin/service/dto"
"go-admin/common/apis"
@@ -34,17 +33,16 @@ func (e *SysDept) GetSysDeptList(c *gin.Context) {
}
list := make([]models.SysDept, 0)
var count int64
serviceStudent := service.SysDept{}
serviceStudent.MsgID = msgID
serviceStudent.Orm = db
err = serviceStudent.GetSysDeptPage(d, &list, &count)
list, err = serviceStudent.SetDeptPage(d)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
return
}
e.PageOK(c, list, int(count), d.GetPageIndex(), d.GetPageSize(), "查询成功")
e.OK(c, list, "查询成功")
}
func (e *SysDept) GetSysDept(c *gin.Context) {
@@ -172,3 +170,39 @@ func (e *SysDept) DeleteSysDept(c *gin.Context) {
}
e.OK(c, control.GetId(), "删除成功")
}
// GetDeptTree 用户管理 左侧部门树
func (e *SysDept) GetDeptTree(c *gin.Context) {
msgID := tools.GenerateMsgIDFromContext(c)
d := new(dto.SysDeptSearch)
db, err := tools.GetOrm(c)
if err != nil {
log.Error(err)
return
}
//查询列表
err = d.Bind(c)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "参数验证失败")
return
}
list := make([]dto.DeptLabel, 0)
serviceStudent := service.SysDept{}
serviceStudent.MsgID = msgID
serviceStudent.Orm = db
list, err = serviceStudent.SetDeptTree(d)
if err != nil {
e.Error(c, http.StatusUnprocessableEntity, err, "查询失败")
return
}
//var Dept models.SysDepts
//Dept.DeptName = c.Request.FormValue("deptName")
//Dept.Status = c.Request.FormValue("status")
//Dept.DeptId, _ = tools.StringToInt(c.Request.FormValue("deptId"))
//result, err := Dept.SetDept(false)
//tools.HasError(err, "抱歉未找到相关信息", -1)
e.OK(c, list, "")
}