team_user

app/operate/apis/org_club.go

@@ -267,12 +267,12 @@ func (e OrgClub) Delete(c *gin.Context) {
 
 	sOrgClubUser := service.OrgClubUser{}
 	e.MakeContext(c).MakeOrm().MakeService(&sOrgClubUser.Service)
-	_, userId := sOrgClubUser.GetUserId(req.GetId().(int))
+	_, userId := sOrgClubUser.GetUserIds(req.GetId().([]int))
 
 	sSysUser := sService.SysUser{}
 	reqSysUser := sDto.SysUserById{}
 	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
-	reqSysUser.Id, _ = strconv.Atoi(userId)
+	reqSysUser.Ids = userId
 	// 设置编辑人
 	reqSysUser.SetUpdateBy(user.GetUserId(c))
 

app/operate/apis/org_team_user.go

@@ -182,6 +182,25 @@ func (e OrgTeamUser) Update(c *gin.Context) {
 		e.Error(500, err, fmt.Sprintf("修改球队人员账户信息 失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
+
+	sSysUser := sService.SysUser{}
+	reqSysUser := sDto.SysUserUpdateReq{}
+	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
+	reqSysUser.Username = req.UserName
+	reqSysUser.NickName = req.Name
+	reqSysUser.NickNameEn = req.NameEn
+	reqSysUser.Phone = req.UserName
+	reqSysUser.UserId, _ = strconv.Atoi(req.UserId)
+
+	// 设置创建人
+	reqSysUser.SetCreateBy(user.GetUserId(c))
+	err = sSysUser.Update(&reqSysUser, p)
+	if err != nil {
+		e.Logger.Error(err)
+		e.Error(500, err, err.Error())
+		return
+	}
+
 	e.OK(req.GetId(), "修改成功")
 }
 
@@ -210,10 +229,26 @@ func (e OrgTeamUser) Delete(c *gin.Context) {
 	// req.SetUpdateBy(user.GetUserId(c))
 	p := actions.GetPermissionFromContext(c)
 
+	_, userIds := s.GetUserId(req.Ids)
+
 	err = s.Remove(&req, p)
 	if err != nil {
 		e.Error(500, err, fmt.Sprintf("删除球队人员账户信息失败，\r\n失败信息 %s", err.Error()))
 		return
 	}
+
+	sSysUser := sService.SysUser{}
+	reqSysUser := sDto.SysUserById{}
+	e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
+	reqSysUser.Ids = userIds
+	// 设置编辑人
+	reqSysUser.SetUpdateBy(user.GetUserId(c))
+
+	err = sSysUser.Remove(&reqSysUser, p)
+	if err != nil {
+		e.Logger.Error(err)
+		return
+	}
+
 	e.OK(req.GetId(), "删除成功")
 }

app/operate/service/dto/org_club.go

@@ -86,7 +86,7 @@ func (s *OrgClubGetReq) GetId() interface{} {
 
 // OrgClubDeleteReq 功能删除请求参数
 type OrgClubDeleteReq struct {
-	Ids int `json:"ids"`
+	Ids []int `json:"ids"`
 }
 
 func (s *OrgClubDeleteReq) GetId() interface{} {

app/operate/service/dto/org_team_user.go

@@ -60,14 +60,17 @@ func (s *OrgTeamUserInsertReq) GetId() interface{} {
 }
 
 type OrgTeamUserUpdateReq struct {
-	Id      int    `uri:"id" comment:""` //
-	ClubId  string `json:"clubId" comment:"org_club表id"`
-	TeamId  string `json:"teamId" comment:"org_team表id"`
-	UserId  string `json:"userId" comment:"sys_user表id"`
-	Name    string `json:"name" comment:"姓名"`
-	Sex     string `json:"sex" comment:"性别"`
-	UserImg string `json:"userImg" comment:"用户照片"`
-	SignImg string `json:"signImg" comment:"签名照片"`
+	Id       int    `uri:"id" comment:""` //
+	ClubId   string `json:"clubId" comment:"org_club表id"`
+	TeamId   string `json:"teamId" comment:"org_team表id"`
+	RoleId   string `json:"roleId" comment:"角色id"`
+	UserId   string `json:"userId" comment:"sys_user表id"`
+	Name     string `json:"name" comment:"姓名"`
+	NameEn   string `json:"name_en" comment:"姓名"`
+	Sex      string `json:"sex" comment:"性别"`
+	UserImg  string `json:"userImg" comment:"用户照片"`
+	SignImg  string `json:"signImg" comment:"签名照片"`
+	UserName string `json:"userName" comment:"账号"`
 	common.ControlBy
 }
 

app/operate/service/org_club_user.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"errors"
+	"strconv"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
@@ -57,7 +58,6 @@ func (e *OrgClubUser) Get(d *dto.OrgClubUserGetReq, p *actions.DataPermission, m
 	return nil
 }
 
-// Get 获取OrgClubUser对象
 func (e *OrgClubUser) GetUserId(clubId int) (error, string) {
 	data := new(models.OrgClubUser)
 
@@ -69,6 +69,24 @@ func (e *OrgClubUser) GetUserId(clubId int) (error, string) {
 	return nil, data.UserId
 }
 
+// Get 获取OrgClubUser对象
+func (e *OrgClubUser) GetUserIds(clubId []int) (error, []int) {
+	data := make([]models.OrgClubUser, 0)
+
+	e.Orm.Table("org_club_user").
+		Select("user_id,club_id").
+		Where("club_id IN(?)", clubId).
+		First(&data)
+
+	ids := make([]int, 0)
+	id := 0
+	for _, v := range data {
+		id, _ = strconv.Atoi(v.UserId)
+		ids = append(ids, id)
+	}
+	return nil, ids
+}
+
 // Get 获取OrgClubUser对象
 func (e *OrgClubUser) GetClubId(userId int) (error, string) {
 	data := new(models.OrgClubUser)

app/operate/service/org_team.go

@@ -3,7 +3,7 @@ package service
 import (
 	"errors"
 
-    "github.com/go-admin-team/go-admin-core/sdk/service"
+	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
 
 	"go-admin/app/operate/models"
@@ -59,35 +59,37 @@ func (e *OrgTeam) Get(d *dto.OrgTeamGetReq, p *actions.DataPermission, model *mo
 
 // Insert 创建OrgTeam对象
 func (e *OrgTeam) Insert(c *dto.OrgTeamInsertReq) error {
-    var err error
-    var data models.OrgTeam
-    c.Generate(&data)
+	var err error
+	var data models.OrgTeam
+	c.Generate(&data)
 	err = e.Orm.Create(&data).Error
 	if err != nil {
 		e.Log.Errorf("OrgTeamService Insert error:%s \r\n", err)
 		return err
 	}
+	c.Id = data.Id
 	return nil
 }
 
 // Update 修改OrgTeam对象
 func (e *OrgTeam) Update(c *dto.OrgTeamUpdateReq, p *actions.DataPermission) error {
-    var err error
-    var data = models.OrgTeam{}
-    e.Orm.Scopes(
-            actions.Permission(data.TableName(), p),
-        ).First(&data, c.GetId())
-    c.Generate(&data)
+	var err error
+	var data = models.OrgTeam{}
+	e.Orm.Scopes(
+		actions.Permission(data.TableName(), p),
+	).First(&data, c.GetId())
+	c.Generate(&data)
 
-    db := e.Orm.Save(&data)
-    if db.Error != nil {
-        e.Log.Errorf("OrgTeamService Save error:%s \r\n", err)
-        return err
-    }
-    if db.RowsAffected == 0 {
-        return errors.New("无权更新该数据")
-    }
-    return nil
+	db := e.Orm.Updates(&data)
+	if db.Error != nil {
+		e.Log.Errorf("OrgTeamService Save error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+	}
+	c.Id = data.Id
+	return nil
 }
 
 // Remove 删除OrgTeam
@@ -99,11 +101,11 @@ func (e *OrgTeam) Remove(d *dto.OrgTeamDeleteReq, p *actions.DataPermission) err
 			actions.Permission(data.TableName(), p),
 		).Delete(&data, d.GetId())
 	if err := db.Error; err != nil {
-        e.Log.Errorf("Service RemoveOrgTeam error:%s \r\n", err)
-        return err
-    }
-    if db.RowsAffected == 0 {
-        return errors.New("无权删除该数据")
-    }
+		e.Log.Errorf("Service RemoveOrgTeam error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权删除该数据")
+	}
 	return nil
-}
+}
\ No newline at end of file

app/operate/service/org_team_user.go

@@ -2,6 +2,7 @@ package service
 
 import (
 	"errors"
+	"strconv"
 
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
@@ -75,6 +76,8 @@ func (e *OrgTeamUser) Insert(c *dto.OrgTeamUserInsertReq) error {
 		e.Log.Errorf("OrgTeamUserService Insert error:%s \r\n", err)
 		return err
 	}
+
+	c.Id = data.Id
 	return nil
 }
 
@@ -85,9 +88,9 @@ func (e *OrgTeamUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermiss
 	e.Orm.Scopes(
 		actions.Permission(data.TableName(), p),
 	).First(&data, c.GetId())
+	userId := data.UserId
 	c.Generate(&data)
-
-	db := e.Orm.Save(&data)
+	db := e.Orm.Updates(&data)
 	if db.Error != nil {
 		e.Log.Errorf("OrgTeamUserService Save error:%s \r\n", err)
 		return err
@@ -95,6 +98,8 @@ func (e *OrgTeamUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermiss
 	if db.RowsAffected == 0 {
 		return errors.New("无权更新该数据")
 	}
+
+	c.UserId = userId
 	return nil
 }
 
@@ -115,3 +120,19 @@ func (e *OrgTeamUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermiss
 	}
 	return nil
 }
+
+// GetPage 获取OrgTeamUser列表
+func (e *OrgTeamUser) GetUserId(ids []int) (error, []int) {
+	list := make([]models.OrgTeamUser, 0)
+	field := "user_id"
+
+	e.Orm.Select(field).Where("id IN(?)", ids).Find(&list)
+
+	userIds := make([]int, 0)
+	userid := 0
+	for _, v := range list {
+		userid, _ = strconv.Atoi(v.UserId)
+		userIds = append(userIds, userid)
+	}
+	return nil, userIds
+}