user org auth

controllers/sysuser/sysuser.go

@@ -88,3 +88,12 @@ func (c *SysuserController) GetCurrentUser() {
 	user := c.Context.Get("user").(*model.SysUser)
 	c.ResponseJSON(user)
 }
+
+func (c *SysuserController) GetOrgAuth() {
+	user := c.Context.Get("user").(*model.SysUser)
+	flag, err := c.dao.GetOrgAuthByUserId(user.UserId)
+	if err != nil {
+		c.ResponseError(err)
+	}
+	c.ResponseJSON(flag)
+}

models/autoreply/autoreply.go

@@ -120,12 +120,13 @@ func (m *AutoreplyDAO) GetAutoReplayByAppID(appid, val string) (*model.TaAutoRep
 					INNER JOIN ta_auto_reply_keywords d ON a.auto_reply_id = d.auto_reply_id
 					WHERE
 						c.appid = ?
+					AND a.is_use = ?
 					AND a.status > ?
 					AND b.status > ?
 					AND a.auto_type = ?
 					AND a.pair_type = ?
 					AND d.keywords = ? order by a.create_date desc`
-	err := m.db.Sql(sql, appid, models.STATUS_DEL, models.STATUS_DEL, models.AUTOREPLY_KEYWORDS, models.PAIR_TYPE_ACU, val).Find(&reply)
+	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)
 	if err != nil {
 		return nil, err
 	}
@@ -142,12 +143,13 @@ func (m *AutoreplyDAO) GetAutoReplayByAppID(appid, val string) (*model.TaAutoRep
 					INNER JOIN ta_auto_reply_keywords d ON a.auto_reply_id = d.auto_reply_id
 					WHERE
 						c.appid = ?
+					AND a.is_use = ?
 					AND a.status > ?
 					AND b.status > ?
 					AND a.auto_type = ?
 					AND a.pair_type = ?
 					AND ? like CONCAT('%', d.keywords, '%') order by a.create_date desc`
-	err = m.db.Sql(sql, appid, models.STATUS_DEL, models.STATUS_DEL, models.AUTOREPLY_KEYWORDS, models.PAIR_TYPE_BLUR, val).Find(&reply)
+	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)
 	if err != nil {
 		return nil, err
 	}
@@ -161,8 +163,8 @@ func (m *AutoreplyDAO) GetAutoReplayByAppID(appid, val string) (*model.TaAutoRep
 func (m *AutoreplyDAO) GetSubscribeByAppID(appid string) (*model.TaAutoReply, error) {
 	var replys []model.TaAutoReply
 	sql := `select a.* from ta_auto_reply a inner join sys_org b on a.org_id=b.org_id
-	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`
-	err := m.db.Sql(sql, appid, models.AUTOREPLY_SUBSCRIBE, models.STATUS_DEL, models.STATUS_DEL).Find(&replys)
+	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`
+	err := m.db.Sql(sql, appid, models.AUTOREPLY_IS_USE_ON, models.AUTOREPLY_SUBSCRIBE, models.STATUS_DEL, models.STATUS_DEL).Find(&replys)
 	if err != nil {
 		return nil, err
 	}

models/sysuser/sysuser.go

@@ -132,3 +132,23 @@ WHERE
 	}
 	return "", err
 }
+func (m *SysuserDAO) GetOrgAuthByUserId(userId string) (bool, error) {
+	var org []model.SysOrg
+	sql := `SELECT
+	a.* 
+FROM
+	sys_org a
+	INNER JOIN sys_user b ON a.org_id = b.org_id 
+WHERE
+	b.user_id = '` + userId + `'`
+	err := m.db.Sql(sql).Find(&org)
+	if len(org) <= 0 {
+		return false, err
+	} else {
+		if org[0].OrgId == "" {
+			return false, err
+		}
+	}
+	return true, err
+
+}

models/wechatimg/wechatimg.go

@@ -55,14 +55,7 @@ func (m *WechatImgDAO) AddWechatImg(img model.TaWechatImg) error {
 	return err
 }
 func (m *WechatImgDAO) DeleteWechatImg(mediaId string) error {
-	var img = model.TaWechatImg{
-		MediaId: mediaId,
-		Status:  models.STATUS_DEL,
-	}
-	var cols = []string{
-		"status",
-	}
-	_, err := m.db.Cols(cols...).Where("media_id = ?", img.MediaId).Update(img)
+	_, err := m.db.Delete(&model.TaWechatImg{MediaId: mediaId})
 	return err
 }
 func (m *WechatImgDAO) DeleteBatchByOrgId(orgId string) error {

routers/router.go

@@ -54,6 +54,7 @@ func RouteInit() {
 			beego.NSRouter("/sysuser/unbind/:userId", &sysuser.SysuserController{}, "put:UnbindUser"),
 			beego.NSRouter("/sysuser/pwd/:userId/:pwd", &sysuser.SysuserController{}, "put:ChangePassword"),
 			beego.NSRouter("/sysuser/current", &sysuser.SysuserController{}, "get:GetCurrentUser"),
+			beego.NSRouter("/sysuser/auth", &sysuser.SysuserController{}, "get:GetOrgAuth"),
 			// 项目管理
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "get:GetOrgList"),
 			beego.NSRouter("/sysorg", &sysorg.SysorgController{}, "post:AddOrg"),

service/sysuser/sysuser.go

@@ -105,3 +105,12 @@ func (s *SysuserServ) ChangePassword(userId, pwd string) error {
 	return nil
 
 }
+
+func (s *SysuserServ) GetOrgAuthByUserId(userId string) (bool, error) {
+	flag, err := s.dao.GetOrgAuthByUserId(userId)
+	if err != nil {
+		utils.LogError("获取用户项目授权失败: " + err.Error())
+		return false, errors.New("获取用户项目授权失败")
+	}
+	return flag, nil
+}