Merge branch 'feature/migrate_wechat_msg' into debug

services/task.go

@@ -683,48 +683,27 @@ func AddEdbTask(cont context.Context) (err error) {
 					openIdList := make([]*models.OpenIdList, 0)
 
 					//获取用户信息
-					isAdmin := true
 					admin, err := models.GetAdminByAdminId(tmpEdb.UserId)
 					if err != nil {
 						if err.Error() == utils.ErrNoRow() {
-							isAdmin = false
+							funcErr = errors.New("openId 列表为空" + strconv.Itoa(tmpEdb.UserId))
+							return
 						} else {
 							return err
 						}
 					}
 					if admin == nil {
-						isAdmin = false
-					}
-					if isAdmin {
-						if admin.Mobile == "" {
-
-						} else {
-							wxUser, err := models.GetWxUserByMobile(admin.Mobile)
-							if err != nil {
-								return err
-							}
-							if wxUser == nil {
-								funcErr = errors.New("用户信息不存在：mobile:" + admin.Mobile)
-								return err
-							}
-							tmpOpenidList, err := models.GetUserOpenidListByUserId(int(wxUser.UserId))
-							if err != nil {
-								return err
-							}
-							openIdList = tmpOpenidList
-						}
-					} else {
-						tmpOpenidList, err := models.GetUserOpenidListByUserId(tmpEdb.UserId)
-						if err != nil {
-							return err
-						}
-						openIdList = tmpOpenidList
+						funcErr = errors.New("openId 列表为空" + strconv.Itoa(tmpEdb.UserId))
+						return
 					}
 					//发送消息
-					if len(openIdList) <= 0 {
+					if admin.OpenId == "" {
 						funcErr = errors.New("openId 列表为空" + strconv.Itoa(tmpEdb.UserId))
 						return
 					}
+					openIdTemp := new(models.OpenIdList)
+					openIdTemp.OpenId = admin.OpenId
+					openIdList = append(openIdList, openIdTemp)
 
 					first := "数据录入提醒"
 					keyword1 := tmpEdb.SecName