Merge branch 'master' of http://8.136.199.33:3000/cxzhang/hongze_clpt into debug

models/admin.go

@@ -72,6 +72,20 @@ func GetRaiAdmin() (items []*AdminMobileResp, err error) {
 	return
 }
 
+// 获取IT人员手机号
+func GetRaiAdminIt() (items []*AdminMobileResp, err error) {
+	o := orm.NewOrmUsingDB("weekly_report")
+	sql := ` SELECT
+	mobile 
+FROM
+	admin 
+WHERE
+	department_id = 3 
+	AND enabled = 1 `
+	_, err = o.Raw(sql).QueryRows(&items)
+	return
+}
+
 // 根据角色名称获取手机号
 func GetAdminByRoleName(roleName string) (items []*AdminMobileResp, err error) {
 	o := orm.NewOrmUsingDB("weekly_report")

services/activity.go

@@ -323,7 +323,7 @@ func ActivityConditioninitSql(user *models.WxUserItem, condition string, isPower
 	condition += `   AND art.publish_status = 1 `
 	conditionActivity = condition
 	//弘则可以查看所有活动
-	if GetBelongingRai(user.Mobile) && user.CompanyId == utils.HZ_COMPANY_ID {
+	if GetBelongingRaiIt(user.Mobile) && user.CompanyId == utils.HZ_COMPANY_ID {
 		return
 	}
 	adminIds, err := models.GetSelleridWhichGroup(user.CompanyId, 2)

services/admin.go

@@ -56,6 +56,28 @@ func GetRaiAdminMobileMap() (mapItem map[string]string) {
 	return
 }
 
+// GetRaiAdminMobileItMap 获取it内部人员手机号
+func GetRaiAdminMobileItMap() (mapItem map[string]string) {
+	var err error
+	defer func() {
+		if err != nil {
+			go utils.SendAlarmMsg("获取权益内部人员手机号失败 ErrMsg:"+err.Error(), 2)
+
+		}
+	}()
+	adminList, e := models.GetRaiAdminIt()
+	if e != nil {
+		err = e
+		return
+	}
+	mapMobile := make(map[string]string)
+	for _, v := range adminList {
+		mapMobile[v.Mobile] = v.Mobile
+	}
+	mapItem = mapMobile
+	return
+}
+
 // 根据手机号判断是否属于权益
 func GetBelongingRai(mobile string) (isBelong bool) {
 	mapItem := GetRaiAdminMobileMap()
@@ -64,3 +86,12 @@ func GetBelongingRai(mobile string) (isBelong bool) {
 	}
 	return
 }
+
+// 根据手机号判断是否属于IT人员
+func GetBelongingRaiIt(mobile string) (isBelong bool) {
+	mapItem := GetRaiAdminMobileItMap()
+	if mapItem[mobile] != "" {
+		isBelong = true
+	}
+	return
+}