diff --git a/app/admin/service/dto/sys_user.go b/app/admin/service/dto/sys_user.go
index 0a9b24986e3beb8af1506c147e4eedf45e6364ee..8c9c03d232d6862e5b821b6aee20bd35a443f27f 100755
--- a/app/admin/service/dto/sys_user.go
+++ b/app/admin/service/dto/sys_user.go
@@ -103,6 +103,7 @@ type SysUserInsertReq struct {
PostId int `json:"postId" comment:"宀椾綅"`
Remark string `json:"remark" comment:"澶囨敞"`
Status string `json:"status" comment:"鐘舵€�" vd:"len($)>0" default:"2"`
+ UserType string `json:"userType" comment:"鐢ㄦ埛绫诲瀷 2 璧涗簨 3 淇变箰閮� 4 鐞冮槦 " default:"1"`
common.ControlBy
}
@@ -122,6 +123,7 @@ func (s *SysUserInsertReq) Generate(model *models.SysUser) {
model.PostId = s.PostId
model.Remark = s.Remark
model.Status = s.Status
+ model.UserType = s.UserType
}
func (s *SysUserInsertReq) GetId() interface{} {
diff --git a/app/operate/apis/org_club.go b/app/operate/apis/org_club.go
index 345d42a5d945d47e017583c4806614c4c213fb7f..31681355a30a976d7343d083cb0854d85baec922 100755
--- a/app/operate/apis/org_club.go
+++ b/app/operate/apis/org_club.go
@@ -131,7 +131,7 @@ func (e OrgClub) Insert(c *gin.Context) {
reqSysUser.NickName = req.ClubContacts
reqSysUser.NickNameEn = req.ClubContactsEn
reqSysUser.Phone = req.ClubMobile
- reqSysUser.RoleId = 1
+ reqSysUser.RoleId = 8
reqSysUser.Avatar = ""
reqSysUser.Sex = "0"
reqSysUser.Email = ""
@@ -139,6 +139,7 @@ func (e OrgClub) Insert(c *gin.Context) {
reqSysUser.PostId = 1
reqSysUser.Remark = "淇变箰閮�"
reqSysUser.Status = "2"
+ reqSysUser.UserType = "3"
// 璁剧疆鍒涘缓浜�
reqSysUser.SetCreateBy(user.GetUserId(c))
diff --git a/app/operate/apis/org_team_match.go b/app/operate/apis/org_team_match.go
index a86694d18e7d28273970387c8e151c3cc1d7797f..8d74595cf80f991da6c1f8fdbc330daabdc9bbda 100755
--- a/app/operate/apis/org_team_match.go
+++ b/app/operate/apis/org_team_match.go
@@ -54,7 +54,7 @@ func (e OrgTeamMatch) GetPage(c *gin.Context) {
p := actions.GetPermissionFromContext(c)
list := make([]dto.OrgTeamMatchGetPageReply, 0)
var count int64
-
+ fmt.Println(user.GetUserId(c))
req.TeamId = e.getTeamId(c)
err = s.GetPage(&req, p, &list, &count)
diff --git a/app/operate/apis/org_team_user.go b/app/operate/apis/org_team_user.go
index 4e6865431eb00e2bf8d124bd5df78649d772e5dc..b5d337c722ef4f407c00642a4835ea1b38b71976 100755
--- a/app/operate/apis/org_team_user.go
+++ b/app/operate/apis/org_team_user.go
@@ -121,7 +121,7 @@ func (e OrgTeamUser) Insert(c *gin.Context) {
reqSysUser.NickName = req.Name
reqSysUser.NickNameEn = req.NameEn
reqSysUser.Phone = req.Username
- reqSysUser.RoleId = 1
+ reqSysUser.RoleId = 7
reqSysUser.Avatar = ""
reqSysUser.Sex = req.Sex
reqSysUser.Email = ""
@@ -129,6 +129,7 @@ func (e OrgTeamUser) Insert(c *gin.Context) {
reqSysUser.PostId = 1
reqSysUser.Remark = "鐞冮槦宸ヤ綔浜哄憳"
reqSysUser.Status = "2"
+ reqSysUser.UserType = "4"
// 璁剧疆鍒涘缓浜�
reqSysUser.SetCreateBy(user.GetUserId(c))
diff --git a/app/operate/apis/org_user.go b/app/operate/apis/org_user.go
index b9e57e3cb78d3c94108514c5e84fe96c411ce78e..1b52b474933bfecc9503a100565adf52169708f9 100755
--- a/app/operate/apis/org_user.go
+++ b/app/operate/apis/org_user.go
@@ -2,7 +2,10 @@ package apis
import (
"github.com/gin-gonic/gin/binding"
+ sService "go-admin/app/admin/service"
+ sDto "go-admin/app/admin/service/dto"
"net/http"
+ "strconv"
"github.com/gin-gonic/gin"
"github.com/go-admin-team/go-admin-core/sdk/api"
@@ -93,7 +96,7 @@ func (e OrgUser) Get(c *gin.Context) {
// @Tags 鐢ㄦ埛
// @Accept application/json
// @Product application/json
-// @Param data body dto.SysUserInsertReq true "鐢ㄦ埛鏁版嵁"
+// @Param data body dto.OrgUserInsertReq true "鐢ㄦ埛鏁版嵁"
// @Success 200 {string} string "{"code": 200, "data": [...]}"
// @Router /api/v1/org-user [post]
// @Security Bearer
@@ -110,9 +113,28 @@ func (e OrgUser) Insert(c *gin.Context) {
e.Error(500, err, err.Error())
return
}
+
+ sSysUser := sService.SysUser{}
+ reqSysUser := sDto.SysUserInsertReq{}
+ e.MakeContext(c).MakeOrm().MakeService(&sSysUser.Service)
+ reqSysUser.Username = req.Username
+ reqSysUser.Password = "123456"
+ reqSysUser.NickName = req.NickName
+ reqSysUser.NickNameEn = req.NickNameEn
+ reqSysUser.Phone = req.Username
+ reqSysUser.RoleId, _ = strconv.Atoi(req.RoleId)
+ reqSysUser.Avatar = ""
+ reqSysUser.Sex = "0"
+ reqSysUser.Email = ""
+ reqSysUser.DeptId = 1
+ reqSysUser.PostId = 1
+ reqSysUser.Remark = "璧涗簨"
+ reqSysUser.Status = "2"
+ reqSysUser.UserType = "2"
+
// 璁剧疆鍒涘缓浜�
- req.SetCreateBy(user.GetUserId(c))
- err = s.Insert(&req)
+ reqSysUser.SetCreateBy(user.GetUserId(c))
+ err = sSysUser.Insert(&reqSysUser)
if err != nil {
e.Logger.Error(err)
e.Error(500, err, err.Error())
diff --git a/app/operate/service/org_match_evaluate.go b/app/operate/service/org_match_evaluate.go
index f819f79bb2d02d41592cef6b9651f2237aee83a2..8739dcf407f80e3003501b79f4dc08c81238b39b 100755
--- a/app/operate/service/org_match_evaluate.go
+++ b/app/operate/service/org_match_evaluate.go
@@ -28,7 +28,7 @@ func (e *OrgMatchEvaluate) GetPage(c *dto.OrgMatchEvaluateGetPageReq, p *actions
"ome.remark"
err = e.Orm.Table("org_match_team_player as omtp").
Select(field).
- Joins("left join org_match_evaluate as ome on omtp.player_id = ome.player_id").
+ Joins("left join org_match_evaluate as ome on omtp.match_id = ome.id and omtp.rounds = ome.rounds").
Joins("left join org_match as om on omtp.match_id = om.id and omtp.rounds = om.rounds").
Joins("left join org_league as ol on ol.id = om.league_id").
Joins("left join org_division as od on od.id = om.division_id").