orguser

app/mobile/router/org_player_user.go

@@ -6,20 +6,9 @@ import (
 )
 
 func init() {
-	routerCheckRole = append(routerCheckRole, registerOrgPlayerUserRouter)
 	routerNoCheckRole = append(routerNoCheckRole, registerNoCheckOrgPlayerUserRouter)
 }
 
-// registerOrgPlayerUserRouter
-func registerOrgPlayerUserRouter(v1 *gin.RouterGroup) {
-	api := apis.OrgPlayerUser{}
-	r := v1.Group("/org-player-user")
-	{
-		r.GET("", api.GetPage)
-		r.GET("/:id", api.Get)
-	}
-}
-
 func registerNoCheckOrgPlayerUserRouter(v1 *gin.RouterGroup) {
 	api := apis.OrgPlayerUser{}
 	r := v1.Group("/org-player-user")

app/operate/service/dto/org_user.go

+package dto
+
+import (
+	"go-admin/app/admin/models"
+	"go-admin/common/dto"
+	common "go-admin/common/models"
+	"strconv"
+)
+
+type OrgUserGetPageReq struct {
+	dto.Pagination `search:"-"`
+	NickName       string `form:"nickName"  search:"type:contains;column:nick_name;table:su" comment:"姓名"`     //姓名
+	Username       string `form:"username"  search:"type:contains;column:username;table:su" comment:"账号（手机号）"` //账号（手机号）
+	Status         string `form:"status"  search:"type:exact;column:status;table:su" comment:"状态"`             //状态 1 离职 2 在职
+	RoleId         string `form:"roleId"  search:"type:exact;column:role_id;table:su" comment:"角色"`            //角色
+}
+
+type OrgUserGetPageReply struct {
+	UserId   string `json:"userId"`
+	RoleName string `json:"roleName"`
+	NickName string `json:"nickName"`
+	Username string `json:"username"`
+	RoleId   string `json:"roleId"`
+	Status   string `json:"status"`
+}
+
+func (m *OrgUserGetPageReq) GetNeedSearch() interface{} {
+	return *m
+}
+
+type OrgUserInsertReq struct {
+	UserId     int    `json:"-" comment:""` //
+	RoleId     string `json:"roleId" comment:"角色id"`
+	NickName   string `json:"nickName" comment:"姓名"`
+	NickNameEn string `json:"nickNameEn" comment:"姓名"`
+	Username   string `json:"username" comment:"账号"`
+	common.ControlBy
+}
+
+func (s *OrgUserInsertReq) Generate(model *models.SysUser) {
+	model.UserId = s.UserId
+	model.NickName = s.NickName
+	model.NickNameEn = s.NickNameEn
+	model.Username = s.Username
+	model.RoleId, _ = strconv.Atoi(s.RoleId)
+	model.Status = "2"
+	model.Password = Pwd("123456")
+}
+
+func (s *OrgUserInsertReq) GetId() interface{} {
+	return s.UserId
+}
+
+type OrgUserUpdateReq struct {
+	UserId     int    `json:"-" comment:""` //
+	RoleId     string `json:"roleId" comment:"角色id"`
+	NickName   string `json:"nickName" comment:"姓名"`
+	NickNameEn string `json:"nickNameEn" comment:"姓名"`
+	Username   string `json:"username" comment:"账号"`
+	common.ControlBy
+}
+
+type OrgUserUpdateStatusReq struct {
+	Id     int    `json:"id" comment:""`                 //
+	Status string `json:"status" comment:"状态 1 离职 2 在职"` //状态 1 离职 2 在职
+	common.ControlBy
+}
+
+func (s *OrgUserUpdateReq) Generate(model *models.SysUser) {
+	model.UserId = s.UserId
+	model.NickName = s.NickName
+	model.NickNameEn = s.NickNameEn
+	model.Username = s.Username
+	model.RoleId, _ = strconv.Atoi(s.RoleId)
+	model.Status = "2"
+	model.Password = Pwd("123456")
+}
+
+func (s *OrgUserUpdateReq) GetId() interface{} {
+	return s.UserId
+}
+
+// OrgTeamUserGetReq 功能获取请求参数
+type OrgUserGetReq struct {
+	Id int `uri:"id"`
+}
+
+type OrgUserGetReply struct {
+	UserId   string `json:"userId"`
+	NickName string `json:"nickName"`
+	RoleId   string `json:"roleId"`
+	RoleName string `json:"roleName"`
+	Username string `json:"username"`
+}
+
+func (s *OrgUserGetReq) GetId() interface{} {
+	return s.Id
+}
+
+// OrgTeamUserDeleteReq 功能删除请求参数
+type OrgUserDeleteReq struct {
+	Ids []int `json:"ids"`
+}
+
+func (s *OrgUserDeleteReq) GetId() interface{} {
+	return s.Ids
+}

app/operate/service/org_user.go

+package service
+
+import (
+	"errors"
+	"github.com/go-admin-team/go-admin-core/sdk/service"
+	"gorm.io/gorm"
+
+	"go-admin/app/operate/models"
+	"go-admin/app/operate/service/dto"
+	"go-admin/common/actions"
+	cDto "go-admin/common/dto"
+)
+
+type OrgUser struct {
+	service.Service
+}
+
+// GetPage 获取OrgTeamUser列表
+func (e *OrgUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamUserGetPageReply, count *int64) error {
+	var err error
+	var data models.OrgTeamUser
+	field := "otu.id, oc.club_name, ot.team_name, otu.name, otu.sex, sr.role_name, su.status"
+
+	err = e.Orm.Table("org_team_user as otu").
+		Select(field).
+		Joins("left join org_team as ot on otu.team_id=ot.id").
+		Joins("left join org_club as oc on otu.club_id=oc.id").
+		Joins("left join sys_user as su on otu.user_id=su.user_id").
+		Joins("left join sys_role as sr on su.role_id=sr.role_id").
+		Scopes(
+			cDto.MakeCondition(c.GetNeedSearch()),
+			cDto.Paginate(c.GetPageSize(), c.GetPageIndex()),
+			actions.Permission(data.TableName(), p),
+			cDto.PassDel("otu"),
+		).
+		Find(list).Limit(-1).Offset(-1).
+		Count(count).Error
+	if err != nil {
+		e.Log.Errorf("OrgTeamUserService GetPage error:%s \r\n", err)
+		return err
+	}
+	return nil
+}
+
+// Get 获取OrgTeamUser对象
+func (e *OrgUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model *dto.OrgTeamUserGetReply) error {
+	field := "otu.id,oc.club_name, otu.team_id, ot.team_name, otu.name, otu.sex, otu.user_img, otu.sign_img, sr.role_id, sr.role_name, su.username, su.status"
+
+	err := e.Orm.Table("org_team_user as otu").
+		Select(field).
+		Joins("left join org_team as ot on otu.team_id=ot.id").
+		Joins("left join org_club as oc on otu.club_id=oc.id").
+		Joins("left join sys_user as su on otu.user_id=su.user_id").
+		Joins("left join sys_role as sr on su.role_id=sr.role_id").
+		First(model, d.GetId()).Error
+	if err != nil && errors.Is(err, gorm.ErrRecordNotFound) {
+		err = errors.New("查看对象不存在或无权查看")
+		e.Log.Errorf("Service GetOrgTeamUser error:%s \r\n", err)
+		return err
+	}
+	if err != nil {
+		e.Log.Errorf("db error:%s", err)
+		return err
+	}
+	return nil
+}
+
+// Insert 创建OrgTeamUser对象
+func (e *OrgUser) Insert(c *dto.OrgTeamUserInsertReq) error {
+	var err error
+	var data models.OrgTeamUser
+	c.Generate(&data)
+	err = e.Orm.Create(&data).Error
+	if err != nil {
+		e.Log.Errorf("OrgTeamUserService Insert error:%s \r\n", err)
+		return err
+	}
+
+	c.Id = data.Id
+	return nil
+}
+
+// Update 修改OrgTeamUser对象
+func (e *OrgUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermission) error {
+	var err error
+	var data = models.OrgTeamUser{}
+	e.Orm.Scopes(
+		actions.Permission(data.TableName(), p),
+	).First(&data, c.GetId())
+	userId := data.UserId
+	c.Generate(&data)
+	db := e.Orm.Updates(&data)
+	if db.Error != nil {
+		e.Log.Errorf("OrgTeamUserService Save error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权更新该数据")
+	}
+
+	c.UserId = userId
+	return nil
+}
+
+// Remove 删除OrgTeamUser
+func (e *OrgUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermission) error {
+	var data models.OrgTeamUser
+
+	db := e.Orm.Model(&data).
+		Scopes(
+			actions.Permission(data.TableName(), p),
+		).Delete(&data, d.GetId())
+	if err := db.Error; err != nil {
+		e.Log.Errorf("Service RemoveOrgTeamUser error:%s \r\n", err)
+		return err
+	}
+	if db.RowsAffected == 0 {
+		return errors.New("无权删除该数据")
+	}
+	return nil
+}