日常提交

唐旭辉
conf/dev.conf
controllers/company.go
routers/router.go
services/company/department.go
services/company/user.go
--- a/conf/dev.conf
查看文件 @4d9b205
+++ b/conf/dev.conf
查看文件 @4d9b205
@@ -17,7 +17,7 @@ mysql_host = "${MYSQL_HOST||115.29.205.99}"
 mysql_port = "${MYSQL_PORT||3306}"
 mysql_db_name = "${MYSQL_DB_NAME||opportunity}"
 ##redis相关配置
-redis_add             = "${REDIS_HOST||121.0.0.1}"
+redis_add             = "${REDIS_HOST||127.0.0.1}"
 redis_add_port         = "${REDIS_PORT||6379}"
 redis_auth              = ""
 ##log相关配置
--- a/controllers/company.go
查看文件 @4d9b205
+++ b/controllers/company.go
查看文件 @4d9b205
@@ -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, &param); 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
 }
--- a/routers/router.go
查看文件 @4d9b205
+++ b/routers/router.go
查看文件 @4d9b205
@@ -18,7 +18,7 @@ func init() {
 			beego.NSRouter("/add", &controllers.CompanyController{}, "post:DepartmentAdd"),
 			beego.NSRouter("/edit", &controllers.CompanyController{}, "post:DepartmentUpdate"),
 			beego.NSRouter("/delete", &controllers.CompanyController{}, "post:DepartmentDelete"),
-			// beego.NSRouter("/user", &controllers.CompanyController{}, "post:DepartmentDelete"),
+			beego.NSRouter("/user", &controllers.CompanyController{}, "post:DepartmentUser"),
 		),
 		beego.NSNamespace("position",
 			beego.NSRouter("/list", &controllers.CompanyController{}, "post:PositionList"),
--- a/services/company/department.go
查看文件 @4d9b205
+++ b/services/company/department.go
查看文件 @4d9b205
@@ -414,5 +414,5 @@ func GetDepartmentUser(companyid int64, departmentid int64) ([]protocol.DepartUs
 		}
 		returnData = append(returnData, d)
 	}
-	return nil, nil
+	return returnData, nil
 }
--- a/services/company/user.go
查看文件 @4d9b205
+++ b/services/company/user.go
查看文件 @4d9b205
@@ -459,6 +459,7 @@ func UserList(param protocol.RequestUserList) (protocol.ResponseUserList, error)
 	return responseData, nil
 }
+//GetUserDepartment 获取用户的部门
 func GetUserDepartment(usercompanyid int64) []protocol.DepartmentBase {
 	const datasql string = `SELECT b.name,b.parent_id,b.id FROM user_department AS a
 							JOIN department AS b ON a.department_id = b.id
@@ -475,6 +476,7 @@ func GetUserDepartment(usercompanyid int64) []protocol.DepartmentBase {
 	return data
 }
+//GetUserPosition 获取用户的职业
 func GetUserPosition(usercompanyid int64) []protocol.PositionBase {
 	const datasql string = `SELECT b.name,b.parent_id,b.id FROM user_position AS a
 							JOIN position AS b ON a.position_id = b.id
@@ -491,6 +493,7 @@ func GetUserPosition(usercompanyid int64) []protocol.PositionBase {
 	return data
 }
+//GetUserRole 获取用户的角色
 func GetUserRole(usercompanyid int64) []protocol.RoleBase {
 	const datasql string = `SELECT b.name,b.pid,b.id FROM user_role AS a
 							JOIN role AS b ON a.role_id = b.id
@@ -506,3 +509,29 @@ func GetUserRole(usercompanyid int64) []protocol.RoleBase {
 	}
 	return data
 }
+
+//启用、禁用用户
+func UserForbid(userCompanyIds []int64, companyid int64, enable int8) error {
+	if len(userCompanyIds) == 0 {
+		return nil
+	}
+	if !(enable == models.USERCOMPANY_ENABLE_NO || enable == models.USERCOMPANY_ENABLE_YES) {
+		log.Error("enable err")
+		return protocol.NewErrWithMessage("1")
+	}
+	o := orm.NewOrm()
+	num, err := o.QueryTable(&models.UserCompany{}).
+		Filter("delete_at", 0).
+		Filter("company_id", companyid).
+		Filter("id__in", userCompanyIds).
+		Update(orm.Params{
+			"enable":    enable,
+			"update_at": time.Now(),
+		})
+	if err != nil {
+		log.Error("更新user_company失败:%s", err)
+		protocol.NewErrWithMessage("1")
+	}
+	log.Info("更新记录数：%d", num)
+	return nil
+}