...
|
...
|
@@ -7,7 +7,6 @@ import ( |
|
|
servecompany "oppmg/services/company"
|
|
|
"oppmg/storage/redisdata"
|
|
|
"oppmg/utils"
|
|
|
"strconv"
|
|
|
"strings"
|
|
|
)
|
|
|
|
...
|
...
|
@@ -39,32 +38,6 @@ func (c *CompanyController) DepartmentList() { |
|
|
msg = protocol.NewReturnResponse(listdata, err)
|
|
|
}
|
|
|
|
|
|
// DepartmentUser 部门下的人员
|
|
|
// @router /department/user [get]
|
|
|
func (c *CompanyController) DepartmentUser() {
|
|
|
log.Debug("DepartmentOne param:%v", c.Ctx.Input.Param(":id"))
|
|
|
var msg *protocol.ResponseMessage
|
|
|
defer func() {
|
|
|
c.ResposeJson(msg)
|
|
|
}()
|
|
|
var (
|
|
|
param string
|
|
|
id int64
|
|
|
err error
|
|
|
)
|
|
|
param = c.Ctx.Input.Param(":id")
|
|
|
id, err = strconv.ParseInt(param, 10, 64)
|
|
|
if err != nil {
|
|
|
msg = protocol.BadRequestParam("1")
|
|
|
return
|
|
|
}
|
|
|
if id <= 0 {
|
|
|
msg = protocol.BadRequestParam("1")
|
|
|
return
|
|
|
}
|
|
|
msg = protocol.NewReturnResponse(nil, nil)
|
|
|
}
|
|
|
|
|
|
// DepartmentAdd 添加部门
|
|
|
// @router /department/add [post]
|
|
|
func (c *CompanyController) DepartmentAdd() {
|
...
|
...
|
@@ -350,12 +323,16 @@ func (c *CompanyController) UserDelete() { |
|
|
}
|
|
|
|
|
|
//UserEdit 禁用、启用用户 TODO
|
|
|
//@Router /user/enable [post]
|
|
|
func (c *CompanyController) UserEnable() {
|
|
|
//@Router /user/forbid [post]
|
|
|
func (c *CompanyController) UserForbid() {
|
|
|
var msg *protocol.ResponseMessage
|
|
|
defer func() {
|
|
|
c.ResposeJson(msg)
|
|
|
}()
|
|
|
type Parameter struct {
|
|
|
UserCompanyIds []int64 `json:"ids"`
|
|
|
Status int `json:"status"` // [1:执行禁用操作][2:执行启用操作]
|
|
|
}
|
|
|
var param protocol.RequestUserEdit
|
|
|
if err := json.Unmarshal(c.Ctx.Input.RequestBody, ¶m); err != nil {
|
|
|
log.Error("json 解析失败 err:%s", err)
|
...
|
...
|
@@ -363,10 +340,7 @@ func (c *CompanyController) UserEnable() { |
|
|
return
|
|
|
}
|
|
|
|
|
|
param.CompanyId = c.GetCompanyId()
|
|
|
err := servecompany.UserEdit(param)
|
|
|
redisdata.DeleteLoginToken(0)
|
|
|
msg = protocol.NewReturnResponse(nil, err)
|
|
|
msg = protocol.NewReturnResponse(nil, nil)
|
|
|
return
|
|
|
}
|
|
|
|
...
|
...
|
@@ -411,8 +385,9 @@ func (c *CompanyController) InitCompany() { |
|
|
return
|
|
|
}
|
|
|
|
|
|
//GetDepartmentUser 获取部门下成员
|
|
|
func (c *CommonController) GetDepartmentUser() {
|
|
|
//DepartmentUser 获取部门下成员
|
|
|
//@router /department/user [post]
|
|
|
func (c *CompanyController) DepartmentUser() {
|
|
|
var msg *protocol.ResponseMessage
|
|
|
defer func() {
|
|
|
c.ResposeJson(msg)
|
...
|
...
|
@@ -426,7 +401,8 @@ func (c *CommonController) GetDepartmentUser() { |
|
|
msg = protocol.BadRequestParam("1")
|
|
|
return
|
|
|
}
|
|
|
|
|
|
msg = protocol.NewReturnResponse(nil, nil)
|
|
|
companyid := c.GetCompanyId()
|
|
|
resultdata, err := servecompany.GetDepartmentUser(companyid, param.DepartmentId)
|
|
|
msg = protocol.NewReturnResponse(resultdata, err)
|
|
|
return
|
|
|
} |
...
|
...
|
|