Merge branch 'dev' of http://git.ycjcjy.com/SpaceOfCheng/services into dev

models/system/user.go

@@ -551,9 +551,9 @@ func (m *UserDAO) OpenForbidUser(forbid *model.TaForbidUser) error {
 // UserWithCouponAndCard 用户关联卡券信息
 type UserWithCouponAndCard struct {
 	model.SysUser  `xorm:"extends"`
-	CustomerCoupon []model.TaCustomerCoupon
-	CustomerCard   []model.TaCustomerCard
-	OrdersDetail   []model.TaGoodsOrdersDetail
+	CustomerCoupon []model.TaCustomerCoupon    `xorm:"-"`
+	CustomerCard   []model.TaCustomerCard      `xorm:"-"`
+	OrdersDetail   []model.TaGoodsOrdersDetail `xorm:"-"`
 }
 
 // GetCaseUserByType 获取案场所有销售信息

service/user.go

@@ -594,14 +594,14 @@ func (s *UserServ) GetCaseUserByType(usertype string) ([]system.UserWithCouponAn
 		utils.LogError("获取人员信息失败: " + err.Error())
 		return nil, errors.New("获取人员信息失败")
 	}
-	// 此处拆分到另外一个接口
-	// for inx, user := range users {
-	// 	err := s.GetUserWithDetail(caseinfo.CaseId, &user)
-	// 	if err != nil {
-	// 		return nil, err
-	// 	}
-	// 	users[inx] = user
-	// }
+
+	for inx, user := range users {
+		err := s.GetUserWithDetail(caseinfo.CaseId, &user)
+		if err != nil {
+			return nil, err
+		}
+		users[inx] = user
+	}
 	return users, nil
 }