mmm-go / opp · 提交

转到一个项目

作者 yangfu
提交 f572f8ba0919c43b0b6de1813a2d83ea7ad78b4d 1 个父辈 212846c3

用户职位 部门

内嵌 并排对比
正在显示 11 个修改的文件 包含 261 行增加 和 192 行删除
@@ -29,7 +29,7 @@ @@ -29,7 +29,7 @@
29 |我审核的机会| | | v1/chance/chances| 29 |我审核的机会| | | v1/chance/chances|
30 |机会详情| | | v1/chance/detail| 30 |机会详情| | | v1/chance/detail|
31 |待抓住机会列表| | |v1/chance/chances| 31 |待抓住机会列表| | |v1/chance/chances|
32 -|提交机会| | |v1/chance/public| 32 +|提交机会| | |v1/chance/submit|
33 |部门列表-全部| | |v1/department/departments| 33 |部门列表-全部| | |v1/department/departments|
34 |部门列表-用户| | |v1/department/userDepartments| 34 |部门列表-用户| | |v1/department/userDepartments|
35 |配置-机会类型| | |v1/config/chanceType| 35 |配置-机会类型| | |v1/config/chanceType|
  1 +package v1
  2 +
  3 +import (
  4 + "encoding/json"
  5 + "opp/controllers"
  6 + "opp/protocol"
  7 + "opp/services/department"
  8 +
  9 + "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
  10 +)
  11 +
  12 +type DepartmentController struct {
  13 + controllers.BaseController
  14 +}
  15 +
  16 +//Departments
  17 +//@router /departments [post]
  18 +func (this *DepartmentController) Departments() {
  19 + var msg *protocol.ResponseMessage
  20 + defer func() {
  21 + this.Resp(msg)
  22 + }()
  23 + var request *protocol.DepartmentsRequest
  24 + if err := json.Unmarshal(this.ByteBody, &request); err != nil {
  25 + log.Error(err)
  26 + msg = protocol.BadRequestParam(1)
  27 + return
  28 + }
  29 + if b, m := this.Valid(request); !b {
  30 + msg = m
  31 + return
  32 + }
  33 + header := controllers.GetRequestHeader(this.Ctx)
  34 + msg = protocol.NewReturnResponse(department.Departments(header, request))
  35 +}
@@ -4,6 +4,7 @@ import "opp/models" @@ -4,6 +4,7 @@ import "opp/models"
4 4
5 type IDepartmentRepository interface { 5 type IDepartmentRepository interface {
6 GetDepartmentById(companyId int) (v *models.Department, err error) 6 GetDepartmentById(companyId int) (v *models.Department, err error)
  7 + GetDepartmentByCompanyId(companyId int64) (v []*models.Department, err error)
7 } 8 }
8 9
9 var _ IDepartmentRepository = (*DepartmentRepository)(nil) 10 var _ IDepartmentRepository = (*DepartmentRepository)(nil)
@@ -14,6 +15,10 @@ func (r *DepartmentRepository) GetDepartmentById(id int) (v *models.Department, @@ -14,6 +15,10 @@ func (r *DepartmentRepository) GetDepartmentById(id int) (v *models.Department,
14 return models.GetDepartmentById(id) 15 return models.GetDepartmentById(id)
15 } 16 }
16 17
  18 +func (r *DepartmentRepository) GetDepartmentByCompanyId(companyId int64) (v []*models.Department, err error) {
  19 + return models.GetDepartmentByCompanyId(companyId)
  20 +}
  21 +
17 type IUserDepartmentRepository interface { 22 type IUserDepartmentRepository interface {
18 GetUserDepartment(userId int64, companyId int64, v interface{}) (err error) 23 GetUserDepartment(userId int64, companyId int64, v interface{}) (err error)
19 } 24 }
1 package models 1 package models
2 2
3 import ( 3 import (
4 - "errors"  
5 "fmt" 4 "fmt"
6 - "reflect"  
7 - "strings"  
8 "time" 5 "time"
9 6
10 "github.com/astaxie/beego/orm" 7 "github.com/astaxie/beego/orm"
@@ -20,7 +17,7 @@ type Department struct { @@ -20,7 +17,7 @@ type Department struct {
20 DeleteAt time.Time `orm:"column(delete_at);type(timestamp)" description:"删除时间"` 17 DeleteAt time.Time `orm:"column(delete_at);type(timestamp)" description:"删除时间"`
21 UpdateAt time.Time `orm:"column(update_at);type(timestamp)" description:"更新时间"` 18 UpdateAt time.Time `orm:"column(update_at);type(timestamp)" description:"更新时间"`
22 Member int `orm:"column(member)" description:"成员数量"` 19 Member int `orm:"column(member)" description:"成员数量"`
23 - Admin int `orm:"column(admin);null" description:"部门负责人id"` 20 + Managers string `orm:"column(managers);null" description:"部门负责人id列表 json 数组 [ ]"`
24 } 21 }
25 22
26 func (t *Department) TableName() string { 23 func (t *Department) TableName() string {
@@ -50,84 +47,6 @@ func GetDepartmentById(id int) (v *Department, err error) { @@ -50,84 +47,6 @@ func GetDepartmentById(id int) (v *Department, err error) {
50 return nil, err 47 return nil, err
51 } 48 }
52 49
53 -// GetAllDepartment retrieves all Department matches certain condition. Returns empty list if  
54 -// no records exist  
55 -func GetAllDepartment(query map[string]string, fields []string, sortby []string, order []string,  
56 - offset int64, limit int64) (ml []interface{}, err error) {  
57 - o := orm.NewOrm()  
58 - qs := o.QueryTable(new(Department))  
59 - // query k=v  
60 - for k, v := range query {  
61 - // rewrite dot-notation to Object__Attribute  
62 - k = strings.Replace(k, ".", "__", -1)  
63 - if strings.Contains(k, "isnull") {  
64 - qs = qs.Filter(k, (v == "true" || v == "1"))  
65 - } else {  
66 - qs = qs.Filter(k, v)  
67 - }  
68 - }  
69 - // order by:  
70 - var sortFields []string  
71 - if len(sortby) != 0 {  
72 - if len(sortby) == len(order) {  
73 - // 1) for each sort field, there is an associated order  
74 - for i, v := range sortby {  
75 - orderby := ""  
76 - if order[i] == "desc" {  
77 - orderby = "-" + v  
78 - } else if order[i] == "asc" {  
79 - orderby = v  
80 - } else {  
81 - return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")  
82 - }  
83 - sortFields = append(sortFields, orderby)  
84 - }  
85 - qs = qs.OrderBy(sortFields...)  
86 - } else if len(sortby) != len(order) && len(order) == 1 {  
87 - // 2) there is exactly one order, all the sorted fields will be sorted by this order  
88 - for _, v := range sortby {  
89 - orderby := ""  
90 - if order[0] == "desc" {  
91 - orderby = "-" + v  
92 - } else if order[0] == "asc" {  
93 - orderby = v  
94 - } else {  
95 - return nil, errors.New("Error: Invalid order. Must be either [asc|desc]")  
96 - }  
97 - sortFields = append(sortFields, orderby)  
98 - }  
99 - } else if len(sortby) != len(order) && len(order) != 1 {  
100 - return nil, errors.New("Error: 'sortby', 'order' sizes mismatch or 'order' size is not 1")  
101 - }  
102 - } else {  
103 - if len(order) != 0 {  
104 - return nil, errors.New("Error: unused 'order' fields")  
105 - }  
106 - }  
107 -  
108 - var l []Department  
109 - qs = qs.OrderBy(sortFields...)  
110 - if _, err = qs.Limit(limit, offset).All(&l, fields...); err == nil {  
111 - if len(fields) == 0 {  
112 - for _, v := range l {  
113 - ml = append(ml, v)  
114 - }  
115 - } else {  
116 - // trim unused fields  
117 - for _, v := range l {  
118 - m := make(map[string]interface{})  
119 - val := reflect.ValueOf(v)  
120 - for _, fname := range fields {  
121 - m[fname] = val.FieldByName(fname).Interface()  
122 - }  
123 - ml = append(ml, m)  
124 - }  
125 - }  
126 - return ml, nil  
127 - }  
128 - return nil, err  
129 -}  
130 -  
131 // UpdateDepartment updates Department by Id and returns error if 50 // UpdateDepartment updates Department by Id and returns error if
132 // the record to be updated doesn't exist 51 // the record to be updated doesn't exist
133 func UpdateDepartmentById(m *Department) (err error) { 52 func UpdateDepartmentById(m *Department) (err error) {
@@ -157,3 +76,16 @@ func DeleteDepartment(id int) (err error) { @@ -157,3 +76,16 @@ func DeleteDepartment(id int) (err error) {
157 } 76 }
158 return 77 return
159 } 78 }
  79 +
  80 +func GetDepartmentByCompanyId(companyId int64) (v []*Department, err error) {
  81 + o := orm.NewOrm()
  82 + sql := `
  83 +select *
  84 +from department
  85 +where company_id =? and delete_at =0
  86 +order by parent_id,id`
  87 + if _, err = o.Raw(sql, companyId).QueryRows(&v); err == nil {
  88 + return
  89 + }
  90 + return
  91 +}
@@ -13,11 +13,6 @@ type UserBaseInfoAggregation struct { @@ -13,11 +13,6 @@ type UserBaseInfoAggregation struct {
13 UserCompany *models.UserCompany 13 UserCompany *models.UserCompany
14 } 14 }
15 15
16 -type Department struct {  
17 - DepartmentId int `orm:"column(department_id)`  
18 - Name string `orm:"column(name)`  
19 -}  
20 -  
21 type Position struct { 16 type Position struct {
22 PositionId int `orm:"column(position_id)` 17 PositionId int `orm:"column(position_id)`
23 Name string `orm:"column(name)` 18 Name string `orm:"column(name)`
  1 +package protocol
  2 +
  3 +const (
  4 + DepartmentAll = iota + 1 //公司所有部门
  5 + DepartmentUser //用户所有部门
  6 +)
  7 +
  8 +/*Departments */
  9 +type DepartmentsRequest struct {
  10 + Type int `json:"type" valid:"Required"` //1:公司所有部门 2:用户所在部门
  11 +}
  12 +type DepartmentsResponse struct {
  13 + Departments []*Department `json:"departments,omitempty"`
  14 +}
  15 +
  16 +type Department struct {
  17 + DepartmentId int `orm:"column(department_id) json:"id"`
  18 + Name string `orm:"column(name) json:"name"`
  19 + PId int `orm:"column(pid) json:"-"`
  20 + Departments []*Department `json:"departments,omitempty"`
  21 +}
@@ -15,8 +15,9 @@ var errmessge ErrorMap = map[int]string{ @@ -15,8 +15,9 @@ var errmessge ErrorMap = map[int]string{
15 2021: "登录失败，手机号或密码错误", 15 2021: "登录失败，手机号或密码错误",
16 2025: "短信验证码验证失败", 16 2025: "短信验证码验证失败",
17 2026: "新密码与确认密码不一致", 17 2026: "新密码与确认密码不一致",
18 - 2027:"密码必须至少有6个字符",  
19 - 2028:"请输入正确的旧密码", 18 + 2027: "密码必须至少有6个字符",
  19 + 2028: "请输入正确的旧密码",
  20 + 2029: "当前手机号已存在,请重新输入",
20 4139: "authCode无效或过期", 21 4139: "authCode无效或过期",
21 4140: "refreshToken过期，需要重新登录授权", 22 4140: "refreshToken过期，需要重新登录授权",
22 4141: "accessToken过期或无效，需要进行重新获取令牌", 23 4141: "accessToken过期或无效，需要进行重新获取令牌",
@@ -9,202 +9,210 @@ func init() { @@ -9,202 +9,210 @@ func init() {
9 9
10 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"], 10 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"],
11 beego.ControllerComments{ 11 beego.ControllerComments{
12 - Method: "AccessToken",  
13 - Router: `/accessToken`, 12 + Method: "AccessToken",
  13 + Router: `/accessToken`,
14 AllowHTTPMethods: []string{"post"}, 14 AllowHTTPMethods: []string{"post"},
15 - MethodParams: param.Make(),  
16 - Params: nil}) 15 + MethodParams: param.Make(),
  16 + Params: nil})
17 17
18 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"], 18 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"],
19 beego.ControllerComments{ 19 beego.ControllerComments{
20 - Method: "Login",  
21 - Router: `/login`, 20 + Method: "Login",
  21 + Router: `/login`,
22 AllowHTTPMethods: []string{"post"}, 22 AllowHTTPMethods: []string{"post"},
23 - MethodParams: param.Make(),  
24 - Params: nil}) 23 + MethodParams: param.Make(),
  24 + Params: nil})
25 25
26 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"], 26 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"],
27 beego.ControllerComments{ 27 beego.ControllerComments{
28 - Method: "RefreshToken",  
29 - Router: `/refreshToken`, 28 + Method: "RefreshToken",
  29 + Router: `/refreshToken`,
30 AllowHTTPMethods: []string{"post"}, 30 AllowHTTPMethods: []string{"post"},
31 - MethodParams: param.Make(),  
32 - Params: nil}) 31 + MethodParams: param.Make(),
  32 + Params: nil})
33 33
34 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"], 34 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"],
35 beego.ControllerComments{ 35 beego.ControllerComments{
36 - Method: "Revoke",  
37 - Router: `/revoke`, 36 + Method: "Revoke",
  37 + Router: `/revoke`,
38 AllowHTTPMethods: []string{"post"}, 38 AllowHTTPMethods: []string{"post"},
39 - MethodParams: param.Make(),  
40 - Params: nil}) 39 + MethodParams: param.Make(),
  40 + Params: nil})
41 41
42 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"], 42 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"],
43 beego.ControllerComments{ 43 beego.ControllerComments{
44 - Method: "SmsCode",  
45 - Router: `/smsCode`, 44 + Method: "SmsCode",
  45 + Router: `/smsCode`,
46 AllowHTTPMethods: []string{"post"}, 46 AllowHTTPMethods: []string{"post"},
47 - MethodParams: param.Make(),  
48 - Params: nil}) 47 + MethodParams: param.Make(),
  48 + Params: nil})
49 49
50 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"], 50 beego.GlobalControllerRouter["opp/controllers/v1:AuthController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:AuthController"],
51 beego.ControllerComments{ 51 beego.ControllerComments{
52 - Method: "UpdateDevice",  
53 - Router: `/updateDevice`, 52 + Method: "UpdateDevice",
  53 + Router: `/updateDevice`,
54 AllowHTTPMethods: []string{"post"}, 54 AllowHTTPMethods: []string{"post"},
55 - MethodParams: param.Make(),  
56 - Params: nil}) 55 + MethodParams: param.Make(),
  56 + Params: nil})
57 57
58 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"], 58 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
59 beego.ControllerComments{ 59 beego.ControllerComments{
60 - Method: "CommentDetailsMulti",  
61 - Router: `/commentDetailsMulti`, 60 + Method: "CommentDetailsMulti",
  61 + Router: `/commentDetailsMulti`,
62 AllowHTTPMethods: []string{"post"}, 62 AllowHTTPMethods: []string{"post"},
63 - MethodParams: param.Make(),  
64 - Params: nil}) 63 + MethodParams: param.Make(),
  64 + Params: nil})
65 65
66 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"], 66 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
67 beego.ControllerComments{ 67 beego.ControllerComments{
68 - Method: "CommentDetailsSingle",  
69 - Router: `/commentDetailsSingle`, 68 + Method: "CommentDetailsSingle",
  69 + Router: `/commentDetailsSingle`,
70 AllowHTTPMethods: []string{"post"}, 70 AllowHTTPMethods: []string{"post"},
71 - MethodParams: param.Make(),  
72 - Params: nil}) 71 + MethodParams: param.Make(),
  72 + Params: nil})
73 73
74 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"], 74 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
75 beego.ControllerComments{ 75 beego.ControllerComments{
76 - Method: "Comments",  
77 - Router: `/comments`, 76 + Method: "Comments",
  77 + Router: `/comments`,
78 AllowHTTPMethods: []string{"post"}, 78 AllowHTTPMethods: []string{"post"},
79 - MethodParams: param.Make(),  
80 - Params: nil}) 79 + MethodParams: param.Make(),
  80 + Params: nil})
81 81
82 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"], 82 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
83 beego.ControllerComments{ 83 beego.ControllerComments{
84 - Method: "Favorite",  
85 - Router: `/favorite`, 84 + Method: "Favorite",
  85 + Router: `/favorite`,
86 AllowHTTPMethods: []string{"post"}, 86 AllowHTTPMethods: []string{"post"},
87 - MethodParams: param.Make(),  
88 - Params: nil}) 87 + MethodParams: param.Make(),
  88 + Params: nil})
89 89
90 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"], 90 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
91 beego.ControllerComments{ 91 beego.ControllerComments{
92 - Method: "IComment",  
93 - Router: `/iComment`, 92 + Method: "IComment",
  93 + Router: `/iComment`,
94 AllowHTTPMethods: []string{"post"}, 94 AllowHTTPMethods: []string{"post"},
95 - MethodParams: param.Make(),  
96 - Params: nil}) 95 + MethodParams: param.Make(),
  96 + Params: nil})
97 97
98 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"], 98 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
99 beego.ControllerComments{ 99 beego.ControllerComments{
100 - Method: "IComments",  
101 - Router: `/iComments`, 100 + Method: "IComments",
  101 + Router: `/iComments`,
102 AllowHTTPMethods: []string{"post"}, 102 AllowHTTPMethods: []string{"post"},
103 - MethodParams: param.Make(),  
104 - Params: nil}) 103 + MethodParams: param.Make(),
  104 + Params: nil})
105 105
106 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"], 106 beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:ChanceController"],
107 beego.ControllerComments{ 107 beego.ControllerComments{
108 - Method: "SympathyAction",  
109 - Router: `/sympathyAction`, 108 + Method: "SympathyAction",
  109 + Router: `/sympathyAction`,
110 AllowHTTPMethods: []string{"post"}, 110 AllowHTTPMethods: []string{"post"},
111 - MethodParams: param.Make(),  
112 - Params: nil}) 111 + MethodParams: param.Make(),
  112 + Params: nil})
113 113
114 beego.GlobalControllerRouter["opp/controllers/v1:CommendController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:CommendController"], 114 beego.GlobalControllerRouter["opp/controllers/v1:CommendController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:CommendController"],
115 beego.ControllerComments{ 115 beego.ControllerComments{
116 - Method: "Company",  
117 - Router: `/company`, 116 + Method: "Company",
  117 + Router: `/company`,
118 AllowHTTPMethods: []string{"post"}, 118 AllowHTTPMethods: []string{"post"},
119 - MethodParams: param.Make(),  
120 - Params: nil}) 119 + MethodParams: param.Make(),
  120 + Params: nil})
  121 +
  122 + beego.GlobalControllerRouter["opp/controllers/v1:DepartmentController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:DepartmentController"],
  123 + beego.ControllerComments{
  124 + Method: "Departments",
  125 + Router: `/departments`,
  126 + AllowHTTPMethods: []string{"post"},
  127 + MethodParams: param.Make(),
  128 + Params: nil})
121 129
122 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"], 130 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"],
123 beego.ControllerComments{ 131 beego.ControllerComments{
124 - Method: "MessageCenter",  
125 - Router: `/messageCenter`, 132 + Method: "MessageCenter",
  133 + Router: `/messageCenter`,
126 AllowHTTPMethods: []string{"post"}, 134 AllowHTTPMethods: []string{"post"},
127 - MethodParams: param.Make(),  
128 - Params: nil}) 135 + MethodParams: param.Make(),
  136 + Params: nil})
129 137
130 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"], 138 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"],
131 beego.ControllerComments{ 139 beego.ControllerComments{
132 - Method: "MsgCenterAllRead",  
133 - Router: `/msgCenterAllRead`, 140 + Method: "MsgCenterAllRead",
  141 + Router: `/msgCenterAllRead`,
134 AllowHTTPMethods: []string{"post"}, 142 AllowHTTPMethods: []string{"post"},
135 - MethodParams: param.Make(),  
136 - Params: nil}) 143 + MethodParams: param.Make(),
  144 + Params: nil})
137 145
138 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"], 146 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"],
139 beego.ControllerComments{ 147 beego.ControllerComments{
140 - Method: "MsgCenterRead",  
141 - Router: `/msgCenterRead`, 148 + Method: "MsgCenterRead",
  149 + Router: `/msgCenterRead`,
142 AllowHTTPMethods: []string{"post"}, 150 AllowHTTPMethods: []string{"post"},
143 - MethodParams: param.Make(),  
144 - Params: nil}) 151 + MethodParams: param.Make(),
  152 + Params: nil})
145 153
146 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"], 154 beego.GlobalControllerRouter["opp/controllers/v1:MessageController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:MessageController"],
147 beego.ControllerComments{ 155 beego.ControllerComments{
148 - Method: "MsgInteractive",  
149 - Router: `/msgInteractive`, 156 + Method: "MsgInteractive",
  157 + Router: `/msgInteractive`,
150 AllowHTTPMethods: []string{"post"}, 158 AllowHTTPMethods: []string{"post"},
151 - MethodParams: param.Make(),  
152 - Params: nil}) 159 + MethodParams: param.Make(),
  160 + Params: nil})
153 161
154 beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"], 162 beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"],
155 beego.ControllerComments{ 163 beego.ControllerComments{
156 - Method: "Image",  
157 - Router: `/image`, 164 + Method: "Image",
  165 + Router: `/image`,
158 AllowHTTPMethods: []string{"post"}, 166 AllowHTTPMethods: []string{"post"},
159 - MethodParams: param.Make(),  
160 - Params: nil}) 167 + MethodParams: param.Make(),
  168 + Params: nil})
161 169
162 beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"], 170 beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"],
163 beego.ControllerComments{ 171 beego.ControllerComments{
164 - Method: "Video",  
165 - Router: `/video`, 172 + Method: "Video",
  173 + Router: `/video`,
166 AllowHTTPMethods: []string{"post"}, 174 AllowHTTPMethods: []string{"post"},
167 - MethodParams: param.Make(),  
168 - Params: nil}) 175 + MethodParams: param.Make(),
  176 + Params: nil})
169 177
170 beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"], 178 beego.GlobalControllerRouter["opp/controllers/v1:UploadController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UploadController"],
171 beego.ControllerComments{ 179 beego.ControllerComments{
172 - Method: "Voice",  
173 - Router: `/voice`, 180 + Method: "Voice",
  181 + Router: `/voice`,
174 AllowHTTPMethods: []string{"post"}, 182 AllowHTTPMethods: []string{"post"},
175 - MethodParams: param.Make(),  
176 - Params: nil}) 183 + MethodParams: param.Make(),
  184 + Params: nil})
177 185
178 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"], 186 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"],
179 beego.ControllerComments{ 187 beego.ControllerComments{
180 - Method: "ChangePassword",  
181 - Router: `/changePassword`, 188 + Method: "ChangePassword",
  189 + Router: `/changePassword`,
182 AllowHTTPMethods: []string{"post"}, 190 AllowHTTPMethods: []string{"post"},
183 - MethodParams: param.Make(),  
184 - Params: nil}) 191 + MethodParams: param.Make(),
  192 + Params: nil})
185 193
186 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"], 194 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"],
187 beego.ControllerComments{ 195 beego.ControllerComments{
188 - Method: "ChangePhone",  
189 - Router: `/changePhone`, 196 + Method: "ChangePhone",
  197 + Router: `/changePhone`,
190 AllowHTTPMethods: []string{"post"}, 198 AllowHTTPMethods: []string{"post"},
191 - MethodParams: param.Make(),  
192 - Params: nil}) 199 + MethodParams: param.Make(),
  200 + Params: nil})
193 201
194 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"], 202 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"],
195 beego.ControllerComments{ 203 beego.ControllerComments{
196 - Method: "CheckSmsCode",  
197 - Router: `/checkSmsCode`, 204 + Method: "CheckSmsCode",
  205 + Router: `/checkSmsCode`,
198 AllowHTTPMethods: []string{"post"}, 206 AllowHTTPMethods: []string{"post"},
199 - MethodParams: param.Make(),  
200 - Params: nil}) 207 + MethodParams: param.Make(),
  208 + Params: nil})
201 209
202 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"], 210 beego.GlobalControllerRouter["opp/controllers/v1:UserController"] = append(beego.GlobalControllerRouter["opp/controllers/v1:UserController"],
203 beego.ControllerComments{ 211 beego.ControllerComments{
204 - Method: "ResetPassword",  
205 - Router: `/resetPassword`, 212 + Method: "ResetPassword",
  213 + Router: `/resetPassword`,
206 AllowHTTPMethods: []string{"post"}, 214 AllowHTTPMethods: []string{"post"},
207 - MethodParams: param.Make(),  
208 - Params: nil}) 215 + MethodParams: param.Make(),
  216 + Params: nil})
209 217
210 } 218 }
@@ -19,6 +19,7 @@ func init() { @@ -19,6 +19,7 @@ func init() {
19 beego.NSNamespace("user", beego.NSInclude(&v1.UserController{})), 19 beego.NSNamespace("user", beego.NSInclude(&v1.UserController{})),
20 beego.NSNamespace("chance", beego.NSInclude(&v1.ChanceController{})), 20 beego.NSNamespace("chance", beego.NSInclude(&v1.ChanceController{})),
21 beego.NSNamespace("message", beego.NSInclude(&v1.MessageController{})), 21 beego.NSNamespace("message", beego.NSInclude(&v1.MessageController{})),
  22 + beego.NSNamespace("department", beego.NSInclude(&v1.DepartmentController{})),
22 ) 23 )
23 beego.AddNamespace(nsV1) 24 beego.AddNamespace(nsV1)
24 beego.SetStaticPath("/file/opp", beego.AppConfig.String("source_path")) 25 beego.SetStaticPath("/file/opp", beego.AppConfig.String("source_path"))
  1 +package department
  2 +
  3 +import (
  4 + "gitlab.fjmaimaimai.com/mmm-go/gocomm/pkg/log"
  5 + "opp/internal/repository"
  6 + "opp/models"
  7 + "opp/protocol"
  8 +)
  9 +
  10 +func Departments(header *protocol.RequestHeader, request *protocol.DepartmentsRequest) (rsp *protocol.DepartmentsResponse, err error) {
  11 + var (
  12 + departments []*models.Department
  13 + )
  14 + rsp = &protocol.DepartmentsResponse{}
  15 + switch request.Type {
  16 + case protocol.DepartmentAll:
  17 + if departments, err = repository.Department.GetDepartmentByCompanyId(header.CompanyId); err != nil {
  18 + log.Error(err)
  19 + return
  20 + }
  21 + //rsp.Departments =
  22 + for i := range departments {
  23 + var newD *protocol.Department = &protocol.Department{
  24 + DepartmentId: departments[i].Id,
  25 + Name: departments[i].Name,
  26 + }
  27 + if departments[i].ParentId == 0 {
  28 + rsp.Departments = append(rsp.Departments, newD)
  29 + }
  30 +
  31 + }
  32 + case protocol.DepartmentUser:
  33 + if err = repository.UserDepartment.GetUserDepartment(header.Uid, header.CompanyId, &rsp.Departments); err != nil {
  34 + log.Error(err)
  35 + return
  36 + }
  37 + default:
  38 + break
  39 + }
  40 + return
  41 +}
  42 +
  43 +//
  44 +//func setDepartment(departments *[]models.Department)[]*protocol.Department{
  45 +// var departments []*protocol.Department
  46 +// for i :=range dfrom{
  47 +//
  48 +// var newD *protocol.Department = &protocol.Department{
  49 +// DepartmentId:dfrom[i].Id,
  50 +// Name:dfrom[i].Name,
  51 +// }
  52 +//
  53 +// }
  54 +//
  55 +// if dfrom.ParentId ==0{
  56 +//
  57 +// }
  58 +// if len(department)>0{
  59 +// for i:=range department{
  60 +// if department[i].DepartmentId == dfrom.ParentId{
  61 +// department[i].Departments = append(department[i].Departments,newD)
  62 +// return nil
  63 +// }
  64 +// return setDepartment(department[i].Departments,dfrom)
  65 +// }
  66 +// }
  67 +// return nil
  68 +//}
@@ -47,6 +47,9 @@ func ChangePhone(header *protocol.RequestHeader, request *protocol.ChangePhoneRe @@ -47,6 +47,9 @@ func ChangePhone(header *protocol.RequestHeader, request *protocol.ChangePhoneRe
47 log.Error(err) 47 log.Error(err)
48 return 48 return
49 } 49 }
  50 + if _, err = repository.User.GetUsersByMobile(request.Phone); err == nil {
  51 + err = protocol.NewErrWithMessage(2029)
  52 + }
50 if !result { 53 if !result {
51 err = protocol.NewErrWithMessage(1012) 54 err = protocol.NewErrWithMessage(1012)
52 } 55 }
@@ -68,7 +71,7 @@ func ResetPassword(header *protocol.RequestHeader, request *protocol.ResetPasswo @@ -68,7 +71,7 @@ func ResetPassword(header *protocol.RequestHeader, request *protocol.ResetPasswo
68 if !strings.EqualFold(request.NewPwd, request.ConfirmPwd) { 71 if !strings.EqualFold(request.NewPwd, request.ConfirmPwd) {
69 err = protocol.NewErrWithMessage(2026) 72 err = protocol.NewErrWithMessage(2026)
70 } 73 }
71 - if len(request.NewPwd)<6 { 74 + if len(request.NewPwd) < 6 {
72 err = protocol.NewErrWithMessage(2027) 75 err = protocol.NewErrWithMessage(2027)
73 } 76 }
74 err = utils.UpdateTableByMap(&models.User{Id: user.Id}, map[string]interface{}{"Passwd": request.NewPwd}) 77 err = utils.UpdateTableByMap(&models.User{Id: user.Id}, map[string]interface{}{"Passwd": request.NewPwd})
@@ -84,7 +87,7 @@ func ChangePassword(header *protocol.RequestHeader, request *protocol.ChangePass @@ -84,7 +87,7 @@ func ChangePassword(header *protocol.RequestHeader, request *protocol.ChangePass
84 if !strings.EqualFold(request.NewPwd, request.ConfirmPwd) { 87 if !strings.EqualFold(request.NewPwd, request.ConfirmPwd) {
85 err = protocol.NewErrWithMessage(2026) 88 err = protocol.NewErrWithMessage(2026)
86 } 89 }
87 - if len(request.NewPwd)<6 { 90 + if len(request.NewPwd) < 6 {
88 err = protocol.NewErrWithMessage(2027) 91 err = protocol.NewErrWithMessage(2027)
89 } 92 }
90 if user, err = repository.User.GetUsersById(header.Uid); err != nil { 93 if user, err = repository.User.GetUsersById(header.Uid); err != nil {