前后端一致修复

app/admin/service/dto/sys_file_dir.go

@@ -74,6 +74,10 @@ func (s *SysFileDirControl) GenerateM() (common.ActiveRecord, error) {
 		PId:   s.PId,
 		//Sort:  s.Sort,
 		Path: s.Path,
+		ControlBy: common.ControlBy{
+			CreateBy: s.CreateBy,
+			UpdateBy: s.UpdateBy,
+		},
 	}, nil
 }
 

app/admin/service/dto/sys_login_log.go

@@ -96,7 +96,7 @@ func (s *SysLoginLogById) Bind(ctx *gin.Context) error {
 		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
 		return err
 	}
-	err = ctx.ShouldBind(s)
+	err = ctx.ShouldBind(&s.Ids)
 	if err != nil {
 		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
 	}

app/admin/service/dto/sys_opera_log.go

@@ -118,7 +118,7 @@ func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
 		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
 		return err
 	}
-	err = ctx.ShouldBind(s)
+	err = ctx.ShouldBind(&s.Ids)
 	if err != nil {
 		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
 	}
@@ -126,5 +126,5 @@ func (s *SysOperaLogById) Bind(ctx *gin.Context) error {
 }
 
 func (s *SysOperaLogById) SetUpdateBy(id int) {
-	
+
 }

app/admin/service/dto/sys_role.go

@@ -42,7 +42,7 @@ func (m *SysRoleSearch) Bind(ctx *gin.Context) error {
 
 // SysConfigControl 增、改使用的结构体
 type SysRoleControl struct {
-	RoleId    int    `uri:"roleId" comment:"角色编码"`    // 角色编码
+	RoleId    int    `uri:"id" comment:"角色编码"`        // 角色编码
 	RoleName  string `form:"roleName" comment:"角色名称"` // 角色名称
 	Status    string `form:"status" comment:"状态"`     // 状态
 	RoleKey   string `form:"roleKey" comment:"角色代码"`  // 角色代码
@@ -56,15 +56,15 @@ type SysRoleControl struct {
 // Bind 映射上下文中的结构体数据
 func (s *SysRoleControl) Bind(ctx *gin.Context) error {
 	msgID := tools.GenerateMsgIDFromContext(ctx)
-	err := ctx.ShouldBindUri(s)
+	err := ctx.ShouldBindBodyWith(s, binding.JSON)
+	if err != nil {
+		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
+	}
+	err = ctx.ShouldBindUri(s)
 	if err != nil {
 		log.Debugf("MsgID[%s] ShouldBindUri error: %s", msgID, err.Error())
 		return err
 	}
-	err = ctx.ShouldBindBodyWith(s, binding.JSON)
-	if err != nil {
-		log.Debugf("MsgID[%s] ShouldBind error: %#v", msgID, err.Error())
-	}
 	var jsonStr []byte
 	jsonStr, err = json.Marshal(s)
 	if err != nil {
@@ -126,3 +126,9 @@ func (s *SysRoleById) Bind(ctx *gin.Context) error {
 func (s *SysRoleById) GenerateM() (*models.SysRole, error) {
 	return &models.SysRole{}, nil
 }
+
+// RoleDataScopeReq 角色数据权限修改
+type RoleDataScopeReq struct {
+	RoleId    int    `json:"roleId" binding:"required"`
+	DataScope string `json:"dataScope" binding:"required"`
+}

app/admin/service/sys_file_dir.go

@@ -2,13 +2,13 @@ package service
 
 import (
 	"errors"
+	"fmt"
 	"go-admin/app/admin/models"
 	"go-admin/app/admin/service/dto"
 	"go-admin/common/actions"
 	cDto "go-admin/common/dto"
 	"go-admin/common/log"
 	"go-admin/common/service"
-	"go-admin/tools"
 	"gorm.io/gorm"
 )
 
@@ -59,31 +59,30 @@ func (e *SysFileDir) GetSysFileDir(d cDto.Control, model *models.SysFileDir) err
 // InsertSysFileDir 创建SysFileDir对象
 func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error {
 	var err error
-	var data models.SysFileDir
+	data, _ := model.GenerateM()
+
 	msgID := e.MsgID
 
-	db := e.Orm.Model(&data).
-		Create(model)
-	if db.Error != nil {
+	err = e.Orm.Create(data).Error
+	if err != nil {
 		log.Errorf("msgID[%s] db error:%s", msgID, err)
 		return err
 	}
-	id := model.GetId()
-	path := "/" + tools.IntToString(id.(int))
-	db = e.Orm.Model(&data).
-		First(&data, model.GetId())
-	err = db.Error
+	path := fmt.Sprintf("/%d", model.ID)
+	//db = e.Orm.Model(&data).
+	//	First(&data, model.GetId())
+	//err = db.Error
 
-	if data.PId != 0 {
+	if model.PId != 0 {
 		var dept models.SysFileDir
-		e.Orm.Model(&data).Where("id = ?", data.PId).First(&dept)
+		e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.PId).First(&dept)
 		path = dept.Path + path
 	} else {
 		path = "/0" + path
 	}
 	//var mp = map[string]string{}
 	//mp["path"] = path
-	if err := e.Orm.Model(&data).Where("id = ?", data.ID).Update("path", path).Error; err != nil {
+	if err := e.Orm.Model(&models.SysFileDir{}).Where("id = ?", model.ID).Update("path", path).Error; err != nil {
 		return err
 	}
 
@@ -93,13 +92,13 @@ func (e *SysFileDir) InsertSysFileDir(model *dto.SysFileDirControl) error {
 // UpdateSysFileDir 修改SysFileDir对象
 func (e *SysFileDir) UpdateSysFileDir(c *dto.SysFileDirControl, p *actions.DataPermission) error {
 	var err error
-	var data models.SysFileDir
+	data, _ := c.GenerateM()
 	msgID := e.MsgID
 
-	db := e.Orm.Model(&data).
+	db := e.Orm.
 		Scopes(
 			actions.Permission(data.TableName(), p),
-		).Where(c.ID).Updates(c)
+		).Where(c.ID).Updates(data)
 	if db.Error != nil {
 		log.Errorf("msgID[%s] db error:%s", msgID, err)
 		return err

app/admin/service/sys_login_log.go

@@ -97,7 +97,7 @@ func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveR
 	msgID := e.MsgID
 
 	db := e.Orm.Model(&data).
-		Where(d.GetId()).Delete(c)
+		Where(d.Ids).Delete(c)
 	if db.Error != nil {
 		err = db.Error
 		log.Errorf("MsgID[%s] Delete error: %s", msgID, err)
@@ -108,4 +108,4 @@ func (e *SysLoginLog) RemoveSysLoginLog(d *dto.SysLoginLogById, c common.ActiveR
 		return err
 	}
 	return nil
-}
+}

app/admin/service/sys_opera_log.go

@@ -95,7 +95,7 @@ func (e *SysOperaLog) RemoveSysOperaLog(d *dto.SysOperaLogById) error {
 	var data system.SysOperaLog
 	msgID := e.MsgID
 
-	db := e.Orm.Model(&data).Delete(&data, d.GetId())
+	db := e.Orm.Model(&data).Where(d.Ids).Delete(&data)
 	if db.Error != nil {
 		err = db.Error
 		log.Errorf("MsgID[%s] Delete error: %s", msgID, err)

app/admin/service/sys_role.go

@@ -84,7 +84,6 @@ func (e *SysRole) UpdateSysRole(c *system.SysRole) error {
 	}
 	if db.RowsAffected == 0 {
 		return errors.New("无权更新该数据")
-
 	}
 	return nil
 }