bug 修复

@@ -5,7 +5,6 @@ import (
 	"oppmg/common/log"
 	"oppmg/protocol"
 	servecompany "oppmg/services/company"
-	"oppmg/utils"
 	"strings"
 )
 
@@ -249,44 +248,44 @@ func (c *CompanyController) PositionList() {
 
 //UserAdd 添加用户
 //@Router /user/add [post]
-func (c *CompanyController) UserAdd() {
-	var msg *protocol.ResponseMessage
-	defer func() {
-		c.ResposeJson(msg)
-	}()
-	var param protocol.RequestUserAdd
-	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &param); err != nil {
-		log.Error("json 解析失败 err:%s", err)
-		msg = protocol.BadRequestParam("1")
-		return
-	}
-	name := []rune(strings.TrimSpace(param.Name))
-	if len(name) == 0 {
-		msg = protocol.BadRequestParam("10035")
-		return
-	}
-	if len(name) > 10 {
-		msg = protocol.BadRequestParam("10034")
-		return
-	}
-	ok := utils.PhoneMatch.MatchString(param.Phone)
-	if !ok {
-		msg = protocol.BadRequestParam("10036")
-		return
-	}
-	if len(param.Departments) == 0 {
-		msg = protocol.BadRequestParam("10037")
-		return
-	}
-	if len(param.Roles) == 0 {
-		msg = protocol.BadRequestParam("10038")
-		return
-	}
-	param.CompanyId = c.GetCompanyId()
-	err := servecompany.UserAdd(param)
-	msg = protocol.NewReturnResponse(nil, err)
-	return
-}
+// func (c *CompanyController) UserAdd() {
+// 	var msg *protocol.ResponseMessage
+// 	defer func() {
+// 		c.ResposeJson(msg)
+// 	}()
+// 	var param protocol.RequestUserAdd
+// 	if err := json.Unmarshal(c.Ctx.Input.RequestBody, &param); err != nil {
+// 		log.Error("json 解析失败 err:%s", err)
+// 		msg = protocol.BadRequestParam("1")
+// 		return
+// 	}
+// 	name := []rune(strings.TrimSpace(param.Name))
+// 	if len(name) == 0 {
+// 		msg = protocol.BadRequestParam("10035")
+// 		return
+// 	}
+// 	if len(name) > 10 {
+// 		msg = protocol.BadRequestParam("10034")
+// 		return
+// 	}
+// 	ok := utils.PhoneMatch.MatchString(param.Phone)
+// 	if !ok {
+// 		msg = protocol.BadRequestParam("10036")
+// 		return
+// 	}
+// 	if len(param.Departments) == 0 {
+// 		msg = protocol.BadRequestParam("10037")
+// 		return
+// 	}
+// 	if len(param.Roles) == 0 {
+// 		msg = protocol.BadRequestParam("10038")
+// 		return
+// 	}
+// 	param.CompanyId = c.GetCompanyId()
+// 	err := servecompany.UserAdd(param)
+// 	msg = protocol.NewReturnResponse(nil, err)
+// 	return
+// }
 
 //UserEdit 编辑用户
 //@Router /user/edit [post]
@@ -301,20 +300,20 @@ func (c *CompanyController) UserEdit() {
 		msg = protocol.BadRequestParam("1")
 		return
 	}
-	name := []rune(strings.TrimSpace(param.Name))
-	if len(name) == 0 {
-		msg = protocol.BadRequestParam("10035")
-		return
-	}
-	if len(name) > 10 {
-		msg = protocol.BadRequestParam("10034")
-		return
-	}
+	// name := []rune(strings.TrimSpace(param.Name))
+	// if len(name) == 0 {
+	// 	msg = protocol.BadRequestParam("10035")
+	// 	return
+	// }
+	// if len(name) > 10 {
+	// 	msg = protocol.BadRequestParam("10034")
+	// 	return
+	// }
 
-	if len(param.Departments) == 0 {
-		msg = protocol.BadRequestParam("10037")
-		return
-	}
+	// if len(param.Departments) == 0 {
+	// 	msg = protocol.BadRequestParam("10037")
+	// 	return
+	// }
 	if len(param.Roles) == 0 {
 		msg = protocol.BadRequestParam("10038")
 		return

@@ -87,12 +87,12 @@ type RequestPositionDelete struct {
 
 //RequestUserAdd 添加用户
 type RequestUserAdd struct {
-	Name        string  `json:"name"`
-	CompanyId   int64   `json:"company_id"`
-	Phone       string  `json:"phone"`
-	Departments []int64 `json:"departments"`
-	Positions   []int64 `json:"positions"`
-	Roles       []int64 `json:"roles"`
+	//Name        string  `json:"name"`
+	CompanyId int64 `json:"company_id"`
+	//	Phone       string  `json:"phone"`
+	//	Departments []int64 `json:"departments"`
+	//	Positions   []int64 `json:"positions"`
+	Roles []int64 `json:"roles"`
 }
 
 //RequestUserEdit 编辑用户

@@ -48,7 +48,7 @@ func init() {
 		beego.NSNamespace("/user",
 			beego.NSRouter("/list", &controllers.CompanyController{}, "post:UserList"),
 			// beego.NSRouter("/add", &controllers.CompanyController{}, "post:UserAdd"),
-			// beego.NSRouter("/edit", &controllers.CompanyController{}, "post:UserEdit"),
+			beego.NSRouter("/edit", &controllers.CompanyController{}, "post:UserEdit"),
 			// beego.NSRouter("/delete", &controllers.CompanyController{}, "post:UserDelete"),
 			// beego.NSRouter("/allow_forbid", &controllers.CompanyController{}, "post:UserAllowForbid"),
 			beego.NSRouter("/info", &controllers.CompanyController{}, "post:UserDetail"),

@@ -5,7 +5,6 @@ import (
 	"oppmg/common/log"
 	"oppmg/models"
 	"oppmg/protocol"
-	"oppmg/services/ucenter"
 	"oppmg/storage/redisdata"
 	"oppmg/utils"
 	"strings"
@@ -14,82 +13,82 @@ import (
 	"github.com/astaxie/beego/orm"
 )
 
-func UserAdd(param protocol.RequestUserAdd) error {
-	var (
-		err error
-	)
-	//校验用户是否存在
-	err = existCompanyUser(param.CompanyId, param.Phone)
-	if err != nil {
-		return err
-	}
-	//校验角色
-	err = validCompanyRole(param.CompanyId, param.Roles)
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
-	//校验部门
-	err = validCompanyDepart(param.CompanyId, param.Departments)
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
-	//校验职位
-	err = validCompanyPosition(param.CompanyId, param.Positions)
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
-	var (
-		userId        int64
-		userCompanyid int64
-	)
-	resp, err := ucenter.RequestUCenterAddUser(param.Phone, param.Name, "")
-	if err != nil {
-		log.Error("用户数据提交用户中心失败:%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
-	o := orm.NewOrm()
-	o.Begin()
-	//添加用户
-	userId, err = addNewUser(resp.Data.Nickname, resp.Data.Phone,
-		resp.Data.Id, resp.Data.Avatar, resp.Data.Accid, resp.Data.CustomerAccount, o)
-	if err != nil {
-		o.Rollback()
-		log.Error("addNewUser err:%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
-	//添加用户公司关系
-	userCompanyid, err = addUserCompany(userId, param.CompanyId, param.Name, o)
-	if err != nil {
-		log.Error("addUserCompany err：%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
-	//添加角色
-	err = editUserRole(userCompanyid, userId, param.CompanyId, param.Roles, o)
-	if err != nil {
-		o.Rollback()
-		log.Error("editUserRole err:%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
-	//添加部门
-	err = editUserDepart(userCompanyid, userId, param.CompanyId, param.Departments, o)
-	if err != nil {
-		o.Rollback()
-		log.Error("editUserDepart err:%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
-	//添加职位
-	err = editUserPosition(userCompanyid, userId, param.CompanyId, param.Positions, o)
-	if err != nil {
-		o.Rollback()
-		log.Error("editUserDepart err:%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
-	o.Commit()
-	return nil
-}
+// func UserAdd(param protocol.RequestUserAdd) error {
+// 	var (
+// 		err error
+// 	)
+// 	//校验用户是否存在
+// 	err = existCompanyUser(param.CompanyId, param.Phone)
+// 	if err != nil {
+// 		return err
+// 	}
+// 	//校验角色
+// 	err = validCompanyRole(param.CompanyId, param.Roles)
+// 	if err != nil {
+// 		log.Error(err.Error())
+// 		return err
+// 	}
+// 	//校验部门
+// 	err = validCompanyDepart(param.CompanyId, param.Departments)
+// 	if err != nil {
+// 		log.Error(err.Error())
+// 		return err
+// 	}
+// 	//校验职位
+// 	err = validCompanyPosition(param.CompanyId, param.Positions)
+// 	if err != nil {
+// 		log.Error(err.Error())
+// 		return err
+// 	}
+// 	var (
+// 		userId        int64
+// 		userCompanyid int64
+// 	)
+// 	resp, err := ucenter.RequestUCenterAddUser(param.Phone, param.Name, "")
+// 	if err != nil {
+// 		log.Error("用户数据提交用户中心失败:%s", err)
+// 		return protocol.NewErrWithMessage("1")
+// 	}
+// 	o := orm.NewOrm()
+// 	o.Begin()
+// 	//添加用户
+// 	userId, err = addNewUser(resp.Data.Nickname, resp.Data.Phone,
+// 		resp.Data.Id, resp.Data.Avatar, resp.Data.Accid, resp.Data.CustomerAccount, o)
+// 	if err != nil {
+// 		o.Rollback()
+// 		log.Error("addNewUser err:%s", err)
+// 		return protocol.NewErrWithMessage("1")
+// 	}
+// 	//添加用户公司关系
+// 	userCompanyid, err = addUserCompany(userId, param.CompanyId, param.Name, o)
+// 	if err != nil {
+// 		log.Error("addUserCompany err：%s", err)
+// 		return protocol.NewErrWithMessage("1")
+// 	}
+// 	//添加角色
+// 	err = editUserRole(userCompanyid, userId, param.CompanyId, param.Roles, o)
+// 	if err != nil {
+// 		o.Rollback()
+// 		log.Error("editUserRole err:%s", err)
+// 		return protocol.NewErrWithMessage("1")
+// 	}
+// 	//添加部门
+// 	err = editUserDepart(userCompanyid, userId, param.CompanyId, param.Departments, o)
+// 	if err != nil {
+// 		o.Rollback()
+// 		log.Error("editUserDepart err:%s", err)
+// 		return protocol.NewErrWithMessage("1")
+// 	}
+// 	//添加职位
+// 	err = editUserPosition(userCompanyid, userId, param.CompanyId, param.Positions, o)
+// 	if err != nil {
+// 		o.Rollback()
+// 		log.Error("editUserDepart err:%s", err)
+// 		return protocol.NewErrWithMessage("1")
+// 	}
+// 	o.Commit()
+// 	return nil
+// }
 func validCompanyRole(companyid int64, roleid []int64) error {
 	var (
 		err error
@@ -392,17 +391,17 @@ func UserEdit(param protocol.RequestUserEdit) error {
 		return err
 	}
 	//校验部门
-	err = validCompanyDepart(param.CompanyId, param.Departments)
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
+	// err = validCompanyDepart(param.CompanyId, param.Departments)
+	// if err != nil {
+	// 	log.Error(err.Error())
+	// 	return err
+	// }
 	//校验职位
-	err = validCompanyPosition(param.CompanyId, param.Positions)
-	if err != nil {
-		log.Error(err.Error())
-		return err
-	}
+	// err = validCompanyPosition(param.CompanyId, param.Positions)
+	// if err != nil {
+	// 	log.Error(err.Error())
+	// 	return err
+	// }
 	_, err = models.GetUserById(ucompany.UserId)
 	if err != nil {
 		log.Error("获取用户数据失败：%s", err)
@@ -426,19 +425,19 @@ func UserEdit(param protocol.RequestUserEdit) error {
 		return protocol.NewErrWithMessage("1")
 	}
 	//添加部门
-	err = editUserDepart(param.UserCompanyID, ucompany.UserId, param.CompanyId, param.Departments, o)
-	if err != nil {
-		o.Rollback()
-		log.Error("editUserDepart err:%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
+	// err = editUserDepart(param.UserCompanyID, ucompany.UserId, param.CompanyId, param.Departments, o)
+	// if err != nil {
+	// 	o.Rollback()
+	// 	log.Error("editUserDepart err:%s", err)
+	// 	return protocol.NewErrWithMessage("1")
+	// }
 	//添加职位
-	err = editUserPosition(param.UserCompanyID, ucompany.UserId, param.CompanyId, param.Positions, o)
-	if err != nil {
-		o.Rollback()
-		log.Error("editUserDepart err:%s", err)
-		return protocol.NewErrWithMessage("1")
-	}
+	// err = editUserPosition(param.UserCompanyID, ucompany.UserId, param.CompanyId, param.Positions, o)
+	// if err != nil {
+	// 	o.Rollback()
+	// 	log.Error("editUserDepart err:%s", err)
+	// 	return protocol.NewErrWithMessage("1")
+	// }
 	o.Commit()
 	return nil
 }