Browse Source

user org auth

胡轶钦 6 years ago
parent
commit
7802ae57a7

+ 9
- 0
controllers/sysuser/sysuser.go View File

88
 	user := c.Context.Get("user").(*model.SysUser)
88
 	user := c.Context.Get("user").(*model.SysUser)
89
 	c.ResponseJSON(user)
89
 	c.ResponseJSON(user)
90
 }
90
 }
91
+
92
+func (c *SysuserController) GetOrgAuth() {
93
+	user := c.Context.Get("user").(*model.SysUser)
94
+	flag, err := c.dao.GetOrgAuthByUserId(user.UserId)
95
+	if err != nil {
96
+		c.ResponseError(err)
97
+	}
98
+	c.ResponseJSON(flag)
99
+}

+ 6
- 4
models/autoreply/autoreply.go View File

120
 					INNER JOIN ta_auto_reply_keywords d ON a.auto_reply_id = d.auto_reply_id
120
 					INNER JOIN ta_auto_reply_keywords d ON a.auto_reply_id = d.auto_reply_id
121
 					WHERE
121
 					WHERE
122
 						c.appid = ?
122
 						c.appid = ?
123
+					AND a.is_use = ?
123
 					AND a.status > ?
124
 					AND a.status > ?
124
 					AND b.status > ?
125
 					AND b.status > ?
125
 					AND a.auto_type = ?
126
 					AND a.auto_type = ?
126
 					AND a.pair_type = ?
127
 					AND a.pair_type = ?
127
 					AND d.keywords = ? order by a.create_date desc`
128
 					AND d.keywords = ? order by a.create_date desc`
128
-	err := m.db.Sql(sql, appid, models.STATUS_DEL, models.STATUS_DEL, models.AUTOREPLY_KEYWORDS, models.PAIR_TYPE_ACU, val).Find(&reply)
129
+	err := m.db.Sql(sql, appid, models.AUTOREPLY_IS_USE_ON, models.STATUS_DEL, models.STATUS_DEL, models.AUTOREPLY_KEYWORDS, models.PAIR_TYPE_ACU, val).Find(&reply)
129
 	if err != nil {
130
 	if err != nil {
130
 		return nil, err
131
 		return nil, err
131
 	}
132
 	}
142
 					INNER JOIN ta_auto_reply_keywords d ON a.auto_reply_id = d.auto_reply_id
143
 					INNER JOIN ta_auto_reply_keywords d ON a.auto_reply_id = d.auto_reply_id
143
 					WHERE
144
 					WHERE
144
 						c.appid = ?
145
 						c.appid = ?
146
+					AND a.is_use = ?
145
 					AND a.status > ?
147
 					AND a.status > ?
146
 					AND b.status > ?
148
 					AND b.status > ?
147
 					AND a.auto_type = ?
149
 					AND a.auto_type = ?
148
 					AND a.pair_type = ?
150
 					AND a.pair_type = ?
149
 					AND ? like CONCAT('%', d.keywords, '%') order by a.create_date desc`
151
 					AND ? like CONCAT('%', d.keywords, '%') order by a.create_date desc`
150
-	err = m.db.Sql(sql, appid, models.STATUS_DEL, models.STATUS_DEL, models.AUTOREPLY_KEYWORDS, models.PAIR_TYPE_BLUR, val).Find(&reply)
152
+	err = m.db.Sql(sql, appid, models.AUTOREPLY_IS_USE_ON, models.STATUS_DEL, models.STATUS_DEL, models.AUTOREPLY_KEYWORDS, models.PAIR_TYPE_BLUR, val).Find(&reply)
151
 	if err != nil {
153
 	if err != nil {
152
 		return nil, err
154
 		return nil, err
153
 	}
155
 	}
161
 func (m *AutoreplyDAO) GetSubscribeByAppID(appid string) (*model.TaAutoReply, error) {
163
 func (m *AutoreplyDAO) GetSubscribeByAppID(appid string) (*model.TaAutoReply, error) {
162
 	var replys []model.TaAutoReply
164
 	var replys []model.TaAutoReply
163
 	sql := `select a.* from ta_auto_reply a inner join sys_org b on a.org_id=b.org_id
165
 	sql := `select a.* from ta_auto_reply a inner join sys_org b on a.org_id=b.org_id
164
-	inner join sys_wechat_conf c on b.wechat_id = c.conf_id where c.appid=? and a.auto_type=? and a.status>? and b.status>? order by a.create_date desc`
165
-	err := m.db.Sql(sql, appid, models.AUTOREPLY_SUBSCRIBE, models.STATUS_DEL, models.STATUS_DEL).Find(&replys)
166
+	inner join sys_wechat_conf c on b.wechat_id = c.conf_id where c.appid=? and a.is_use=? and a.auto_type=? and a.status>? and b.status>? order by a.create_date desc`
167
+	err := m.db.Sql(sql, appid, models.AUTOREPLY_IS_USE_ON, models.AUTOREPLY_SUBSCRIBE, models.STATUS_DEL, models.STATUS_DEL).Find(&replys)
166
 	if err != nil {
168
 	if err != nil {
167
 		return nil, err
169
 		return nil, err
168
 	}
170
 	}

+ 20
- 0
models/sysuser/sysuser.go View File

132
 	}
132
 	}
133
 	return "", err
133
 	return "", err
134
 }
134
 }
135
+func (m *SysuserDAO) GetOrgAuthByUserId(userId string) (bool, error) {
136
+	var org []model.SysOrg
137
+	sql := `SELECT
138
+	a.* 
139
+FROM
140
+	sys_org a
141
+	INNER JOIN sys_user b ON a.org_id = b.org_id 
142
+WHERE
143
+	b.user_id = '` + userId + `'`
144
+	err := m.db.Sql(sql).Find(&org)
145
+	if len(org) <= 0 {
146
+		return false, err
147
+	} else {
148
+		if org[0].OrgId == "" {
149
+			return false, err
150
+		}
151
+	}
152
+	return true, err
153
+
154
+}

+ 1
- 8
models/wechatimg/wechatimg.go View File

55
 	return err
55
 	return err
56
 }
56
 }
57
 func (m *WechatImgDAO) DeleteWechatImg(mediaId string) error {
57
 func (m *WechatImgDAO) DeleteWechatImg(mediaId string) error {
58
-	var img = model.TaWechatImg{
59
-		MediaId: mediaId,
60
-		Status:  models.STATUS_DEL,
61
-	}
62
-	var cols = []string{
63
-		"status",
64
-	}
65
-	_, err := m.db.Cols(cols...).Where("media_id = ?", img.MediaId).Update(img)
58
+	_, err := m.db.Delete(&model.TaWechatImg{MediaId: mediaId})
66
 	return err
59
 	return err
67
 }
60
 }
68
 func (m *WechatImgDAO) DeleteBatchByOrgId(orgId string) error {
61
 func (m *WechatImgDAO) DeleteBatchByOrgId(orgId string) error {

+ 1
- 0
routers/router.go View File

54
 			beego.NSRouter("/sysuser/unbind/:userId", &sysuser.SysuserController{}, "put:UnbindUser"),
54
 			beego.NSRouter("/sysuser/unbind/:userId", &sysuser.SysuserController{}, "put:UnbindUser"),
55
 			beego.NSRouter("/sysuser/pwd/:userId/:pwd", &sysuser.SysuserController{}, "put:ChangePassword"),
55
 			beego.NSRouter("/sysuser/pwd/:userId/:pwd", &sysuser.SysuserController{}, "put:ChangePassword"),
56
 			beego.NSRouter("/sysuser/current", &sysuser.SysuserController{}, "get:GetCurrentUser"),
56
 			beego.NSRouter("/sysuser/current", &sysuser.SysuserController{}, "get:GetCurrentUser"),
57
+			beego.NSRouter("/sysuser/auth", &sysuser.SysuserController{}, "get:GetOrgAuth"),
57
 			// 项目管理
58
 			// 项目管理
58
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "get:GetOrgList"),
59
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "get:GetOrgList"),
59
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "post:AddOrg"),
60
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "post:AddOrg"),

+ 9
- 0
service/sysuser/sysuser.go View File

105
 	return nil
105
 	return nil
106
 
106
 
107
 }
107
 }
108
+
109
+func (s *SysuserServ) GetOrgAuthByUserId(userId string) (bool, error) {
110
+	flag, err := s.dao.GetOrgAuthByUserId(userId)
111
+	if err != nil {
112
+		utils.LogError("获取用户项目授权失败: " + err.Error())
113
+		return false, errors.New("获取用户项目授权失败")
114
+	}
115
+	return flag, nil
116
+}