俱乐部

app/operate/apis/org_club.go

@@ -209,12 +209,18 @@ func (e OrgClub) Update(c *gin.Context) {
 		return
 	}
 
+	sOrgClubUser := service.OrgClubUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
+	_, userId := sOrgClubUser.GetUserId(req.GetId().(int))
+
 	sSysUser := sService.SysUser{}
 	reqSysUser := sDto.SysUserUpdateReq{}
+	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
 	reqSysUser.Username = req.ClubUsername
 	reqSysUser.NickName = req.ClubContacts
 	reqSysUser.NickNameEn = req.ClubContactsEn
 	reqSysUser.Phone = req.ClubMobile
+	reqSysUser.UserId, _ = strconv.Atoi(userId)
 
 	// 设置创建人
 	reqSysUser.SetCreateBy(user.GetUserId(c))
@@ -260,10 +266,12 @@ func (e OrgClub) Delete(c *gin.Context) {
 	}
 
 	sOrgClubUser := service.OrgClubUser{}
+	e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
 	_, userId := sOrgClubUser.GetUserId(req.GetId().(int))
 
 	sSysUser := sService.SysUser{}
 	reqSysUser := sDto.SysUserById{}
+	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
 	reqSysUser.Id, _ = strconv.Atoi(userId)
 	// 设置编辑人
 	reqSysUser.SetUpdateBy(user.GetUserId(c))

app/operate/service/org_club.go

@@ -76,12 +76,12 @@ func (e *OrgClub) Insert(c *dto.OrgClubInsertReq) error {
 func (e *OrgClub) Update(c *dto.OrgClubUpdateReq, p *actions.DataPermission) error {
 	var err error
 	var data = models.OrgClub{}
-	e.Orm.Scopes(
+	e.Orm.Table("org_club").Scopes(
 		actions.Permission(data.TableName(), p),
 	).First(&data, c.GetId())
 	c.Generate(&data)
 
-	db := e.Orm.Save(&data)
+	db := e.Orm.Updates(&data)
 	if db.Error != nil {
 		e.Log.Errorf("OrgClubService Save error:%s \r\n", err)
 		return err

app/operate/service/org_club_user.go

@@ -59,25 +59,24 @@ func (e *OrgClubUser) Get(d *dto.OrgClubUserGetReq, p *actions.DataPermission, m
 
 // Get 获取OrgClubUser对象
 func (e *OrgClubUser) GetUserId(clubId int) (error, string) {
-	var data models.OrgClubUser
+	data := new(models.OrgClubUser)
 
-	err := e.Orm.Table("org_club_user").
+	e.Orm.Table("org_club_user").
+		Select("user_id,club_id").
 		Where("club_id=?", clubId).
-		First(data).Error
-	if err != nil {
-		e.Log.Errorf("db error:%s", err)
-		return err, ""
-	}
+		First(&data)
+
 	return nil, data.UserId
 }
 
 // Get 获取OrgClubUser对象
 func (e *OrgClubUser) GetClubId(userId int) (error, string) {
-	var data models.OrgClubUser
+	data := new(models.OrgClubUser)
 
 	err := e.Orm.Table("org_club_user").
+		Select("club_id").
 		Where("user_id=?", userId).
-		First(data).Error
+		First(&data).Error
 	if err != nil {
 		e.Log.Errorf("db error:%s", err)
 		return err, ""