1

app/admin/models/sys_user.go

@@ -22,6 +22,7 @@ type SysUser struct {
 	PostId     int      `json:"postId" gorm:"size:20;comment:岗位"`
 	Remark     string   `json:"remark" gorm:"size:255;comment:备注"`
 	Status     string   `json:"status" gorm:"size:4;comment:状态"`
+	UserType   string   `json:"user_type" gorm:"size:4;comment:用户类型"`
 	DeptIds    []int    `json:"deptIds" gorm:"-"`
 	PostIds    []int    `json:"postIds" gorm:"-"`
 	RoleIds    []int    `json:"roleIds" gorm:"-"`

app/mobile/apis/org_news.go

@@ -27,14 +27,15 @@ type OrgNews struct {
 // @Param pageIndex query int false "页码"
 // @Param data body dto.OrgNewsGetPageReq true "data"
 // @Success 200 {string} string "{"code": 200, "data": [...]}"
-// @Router /mobile/v1/org-news [get]
+// @Router /mobile/v1/org-news [post]
 // @Security Bearer
 func (e OrgNews) GetPage(c *gin.Context) {
 	req := dto.OrgNewsGetPageReq{}
 	s := service.OrgNews{}
-	err := e.MakeContext(c).
+
+	err := c.Bind(&req)
+	err = e.MakeContext(c).
 		MakeOrm().
-		Bind(&req).
 		MakeService(&s.Service).
 		Errors
 	if err != nil {

app/mobile/models/org_league.go

-package models
-
-import (
-   // "gorm.io/gorm"
-
-	"go-admin/common/models"
-)
-
-type OrgLeague struct {
-    models.Model
-    
-    LeagueName string `json:"leagueName" gorm:"type:varchar(255);comment:联赛级别"` 
-    Status string `json:"status" gorm:"type:int(11);comment:联赛开启状态 1 是 0 否"` 
-    models.ModelTime
-    models.ControlBy
-}
-
-func (OrgLeague) TableName() string {
-    return "org_league"
-}
-
-func (e *OrgLeague) Generate() models.ActiveRecord {
-	o := *e
-	return &o
-}
-
-func (e *OrgLeague) GetId() interface{} {
-	return e.Id
-}
\ No newline at end of file

app/operate/router/org_user.go

@@ -26,14 +26,7 @@ func registerOrgUserRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMiddle
 
 	user := v1.Group("/org-user").Use(authMiddleware.MiddlewareFunc()).Use(middleware.AuthCheckRole()).Use(actions.PermissionAction())
 	{
-		user.GET("/profile", api.GetProfile)
-		user.POST("/avatar", api.InsetAvatar)
-		user.PUT("/pwd/set", api.UpdatePwd)
 		user.PUT("/pwd/reset", api.ResetPwd)
 		user.PUT("/status", api.UpdateStatus)
 	}
-	v1auth := v1.Group("/org-user").Use(authMiddleware.MiddlewareFunc())
-	{
-		v1auth.GET("/getinfo", api.GetInfo)
-	}
-}
+}
\ No newline at end of file

app/operate/service/dto/org_user.go

@@ -34,6 +34,8 @@ type OrgUserInsertReq struct {
 	NickName   string `json:"nickName" comment:"姓名"`
 	NickNameEn string `json:"nickNameEn" comment:"姓名"`
 	Username   string `json:"username" comment:"账号"`
+	Status     string `json:"status" comment:"状态" default:"2"`
+	UserType   string `json:"userType" comment:"类型" default:"2"`
 	common.ControlBy
 }
 
@@ -45,6 +47,7 @@ func (s *OrgUserInsertReq) Generate(model *models.SysUser) {
 	model.RoleId, _ = strconv.Atoi(s.RoleId)
 	model.Status = "2"
 	model.Password = Pwd("123456")
+	model.UserType = "2"
 }
 
 func (s *OrgUserInsertReq) GetId() interface{} {

app/operate/service/org_user.go

@@ -5,7 +5,7 @@ import (
 	"github.com/go-admin-team/go-admin-core/sdk/service"
 	"gorm.io/gorm"
 
-	"go-admin/app/operate/models"
+	"go-admin/app/admin/models"
 	"go-admin/app/operate/service/dto"
 	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
@@ -16,9 +16,9 @@ type OrgUser struct {
 }
 
 // GetPage 获取OrgTeamUser列表
-func (e *OrgUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermission, list *[]dto.OrgTeamUserGetPageReply, count *int64) error {
+func (e *OrgUser) GetPage(c *dto.OrgUserGetPageReq, p *actions.DataPermission, list *[]dto.OrgUserGetPageReply, count *int64) error {
 	var err error
-	var data models.OrgTeamUser
+	var data models.SysUser
 	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").
@@ -43,7 +43,7 @@ func (e *OrgUser) GetPage(c *dto.OrgTeamUserGetPageReq, p *actions.DataPermissio
 }
 
 // Get 获取OrgTeamUser对象
-func (e *OrgUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model *dto.OrgTeamUserGetReply) error {
+func (e *OrgUser) Get(d *dto.OrgUserGetReq, p *actions.DataPermission, model *dto.OrgUserGetReply) 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").
@@ -66,9 +66,9 @@ func (e *OrgUser) Get(d *dto.OrgTeamUserGetReq, p *actions.DataPermission, model
 }
 
 // Insert 创建OrgTeamUser对象
-func (e *OrgUser) Insert(c *dto.OrgTeamUserInsertReq) error {
+func (e *OrgUser) Insert(c *dto.OrgUserInsertReq) error {
 	var err error
-	var data models.OrgTeamUser
+	var data models.SysUser
 	c.Generate(&data)
 	err = e.Orm.Create(&data).Error
 	if err != nil {
@@ -76,14 +76,14 @@ func (e *OrgUser) Insert(c *dto.OrgTeamUserInsertReq) error {
 		return err
 	}
 
-	c.Id = data.Id
+	c.UserId = data.UserId
 	return nil
 }
 
 // Update 修改OrgTeamUser对象
-func (e *OrgUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermission) error {
+func (e *OrgUser) Update(c *dto.OrgUserUpdateReq, p *actions.DataPermission) error {
 	var err error
-	var data = models.OrgTeamUser{}
+	var data = models.SysUser{}
 	e.Orm.Scopes(
 		actions.Permission(data.TableName(), p),
 	).First(&data, c.GetId())
@@ -103,8 +103,8 @@ func (e *OrgUser) Update(c *dto.OrgTeamUserUpdateReq, p *actions.DataPermission)
 }
 
 // Remove 删除OrgTeamUser
-func (e *OrgUser) Remove(d *dto.OrgTeamUserDeleteReq, p *actions.DataPermission) error {
-	var data models.OrgTeamUser
+func (e *OrgUser) Remove(d *dto.OrgUserDeleteReq, p *actions.DataPermission) error {
+	var data models.SysUser
 
 	db := e.Orm.Model(&data).
 		Scopes(

common/dto/pagination.go

 package dto
 
 type Pagination struct {
-	PageIndex int `form:"pageIndex"`
-	PageSize  int `form:"pageSize"`
+	PageIndex int `form:"pageIndex" json:"pageIndex"`
+	PageSize  int `form:"pageSize" json:"pageSize"`
 }
 
 func (m *Pagination) GetPageIndex() int {