fix🐛 修复部门数据权限

publish🚀 1.3.5

README.md

@@ -23,9 +23,11 @@
 
 系统初始化极度简单，只需要配置文件中，修改数据库连接，系统启动后会自动初始化数据库信息以及必须的基础数据
 
-[在线文档国际](https://wenjianzhang.github.io/go-admin-site)
+[在线文档](https://doc.go-admin.dev)
 
-[在线文档国内](http://mydearzwj.gitee.io/go-admin-site/)
+[github在线文档](https://wenjianzhang.github.io)
+
+[gitee在线文档](http://mydearzwj.gitee.io/go-admin-doc/)
 
 [前端项目](https://github.com/go-admin-team/go-admin-ui)
 
@@ -156,14 +158,35 @@ vi ./config/setting.yml
 # 2. 确认log路径
 ```
 
+:::tip ⚠️注意 在windows环境如果没有安装中CGO，会出现这个问题；
+
+```bash
+E:\go-admin>go build
+# github.com/mattn/go-sqlite3
+cgo: exec /missing-cc: exec: "/missing-cc": file does not exist
+```
+
+or
+
+```bash
+D:\Code\go-admin>go build
+# github.com/mattn/go-sqlite3
+cgo: exec gcc: exec: "gcc": executable file not found in %PATH%
+```
+
+[解决cgo问题进入](https://doc.go-admin.dev/guide/other/faq.html#_5-cgo-exec-missing-cc-exec-missing-cc-file-does-not-exist)
+
+:::
+
 #### 初始化数据库，以及服务启动
+
 ``` bash
 # 首次配置需要初始化数据库资源信息
 # macOS or linux 下使用
 $ ./go-admin migrate -c=config/settings.dev.yml
 
 # ⚠️注意:windows 下使用
-$ ./go-admin.exe migrate -c=config/settings.dev.yml
+$ go-admin.exe migrate -c=config/settings.dev.yml
 
 
 # 启动项目，也可以用IDE进行调试
@@ -172,7 +195,7 @@ $ ./go-admin server -c config/settings.yml
 
 
 # ⚠️注意:windows 下使用
-$ ./go-admin.exe server -c config/settings.yml
+$ go-admin.exe server -c config/settings.yml
 ```
 
 #### 使用docker 编译启动
@@ -285,4 +308,4 @@ zhuqiyun LLL狐 星星之火 cjj770 Sam 唐*i 晓聪 aLong *渊 海马 魏镇坪
 
 [MIT](https://github.com/go-admin-team/go-admin/blob/master/LICENSE.md)
 
-Copyright (c) 2020 wenjianzhang
+Copyright (c) 2020 wenjianzhang

app/admin/apis/sys_file/sys_file_dir.go

@@ -19,7 +19,7 @@ type SysFileDir struct {
 }
 
 func (e SysFileDir) GetSysFileDirList(c *gin.Context) {
-	e.SetContext(c)
+	e.Context = c
 	log := e.GetLogger()
 	search := new(dto.SysFileDirSearch)
 	db, err := e.GetOrm()
@@ -49,7 +49,7 @@ func (e SysFileDir) GetSysFileDirList(c *gin.Context) {
 
 func (e SysFileDir) GetSysFileDir(c *gin.Context) {
 	control := new(dto.SysFileDirById)
-	e.SetContext(c)
+	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
@@ -81,7 +81,7 @@ func (e SysFileDir) GetSysFileDir(c *gin.Context) {
 
 func (e SysFileDir) InsertSysFileDir(c *gin.Context) {
 	control := new(dto.SysFileDirControl)
-	e.SetContext(c)
+	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
@@ -195,4 +195,4 @@ func (e SysFileDir) DeleteSysFileDir(c *gin.Context) {
 		return
 	}
 	e.OK(control.Id, "删除成功")
-}
+}

app/admin/apis/sys_job/sys_job.go

@@ -16,6 +16,7 @@ type SysJob struct {
 
 // RemoveJobForService 调用service实现
 func (e SysJob) RemoveJobForService(c *gin.Context) {
+	e.Context = c
 	log := e.GetLogger()
 	db, err := e.GetOrm()
 	if err != nil {
@@ -23,7 +24,7 @@ func (e SysJob) RemoveJobForService(c *gin.Context) {
 		return
 	}
 	var v dto.GeneralDelDto
-	err = c.BindUri(&v)
+	err = c.Bind(&v)
 	if err != nil {
 		log.Warnf("参数验证错误, error: %s", err)
 		e.Error(http.StatusUnprocessableEntity, err, "参数验证失败")

app/admin/apis/tools/gen.go

@@ -273,6 +273,7 @@ func (e Gen) genApiToFile(c *gin.Context, tab tools.SysTables) {
 }
 
 func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
+	e.Context = c
 	log := api.GetRequestLogger(c)
 	basePath := "template/v4/"
 	routerFile := basePath + "actions/router_check_role.go.template"
@@ -338,7 +339,7 @@ func (e Gen) ActionsGen(c *gin.Context, tab tools.SysTables) {
 
 func (e Gen) GenMenuAndApi(c *gin.Context) {
 	log := api.GetRequestLogger(c)
-
+	e.Context = c
 	table := tools.SysTables{}
 	timeNow := pkg.GetCurrentTime()
 	id, err := pkg.StringToInt(c.Param("tableId"))
@@ -578,4 +579,4 @@ func (e Gen) GenMenuAndApi(c *gin.Context) {
 	ADelete.MenuId, err = ADelete.Create(db)
 
 	e.OK("", "数据生成成功！")
-}
+}

app/admin/apis/tools/systables.go

@@ -6,7 +6,6 @@ import (
 
 	"github.com/gin-gonic/gin"
 	"github.com/go-admin-team/go-admin-core/sdk/pkg"
-	"github.com/go-admin-team/go-admin-core/sdk/pkg/jwtauth/user"
 	_ "github.com/go-admin-team/go-admin-core/sdk/pkg/response"
 	"gorm.io/gorm"
 
@@ -188,7 +187,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	var dbTable tools.DBTables
 	var dbColumn tools.DBColumns
 	data.TBName = tablesList[i]
-	data.CreateBy = user.GetUserIdStr(c)
+	data.CreateBy = 0
 
 	dbTable.TableName = data.TBName
 	dbtable, err := dbTable.Get(tx)
@@ -210,7 +209,7 @@ func genTableInit(tx *gorm.DB, tablesList []string, i int, c *gin.Context) (tool
 	data.Crud = true
 
 	dbcolumn, err := dbColumn.GetList(tx)
-	data.CreateBy = user.GetUserIdStr(c)
+	data.CreateBy = 0
 	data.TableComment = dbtable.TableComment
 	if dbtable.TableComment == "" {
 		data.TableComment = data.ClassName
@@ -310,7 +309,7 @@ func (e *SysTable) UpdateSysTable(c *gin.Context) {
 		return
 	}
 
-	data.UpdateBy = user.GetUserIdStr(c)
+	data.UpdateBy = 0
 	result, err := data.Update(db)
 	if err != nil {
 		log.Errorf("Update error, %s", err.Error())

app/admin/models/tools/syscolumns.go

@@ -41,8 +41,8 @@ type SysColumns struct {
 	FkCol              []SysColumns `gorm:"-" json:"fkCol"`
 	FkLabelId          string       `gorm:"" json:"fkLabelId"`
 	FkLabelName        string       `gorm:"size:255;" json:"fkLabelName"`
-	CreateBy           string       `gorm:"column:create_by;size:128;" json:"createBy"`
-	UpdateBy           string       `gorm:"column:update_By;size:128;" json:"updateBy"`
+	CreateBy           int          `gorm:"column:create_by;size:20;" json:"createBy"`
+	UpdateBy           int          `gorm:"column:update_By;size:20;" json:"updateBy"`
 
 	models.BaseModel
 }
@@ -66,6 +66,7 @@ func (e *SysColumns) GetList(tx *gorm.DB) ([]SysColumns, error) {
 
 func (e *SysColumns) Create(tx *gorm.DB) (SysColumns, error) {
 	var doc SysColumns
+	e.CreateBy = 0
 	result := tx.Table("sys_columns").Create(&e)
 	if result.Error != nil {
 		err := result.Error
@@ -82,6 +83,7 @@ func (e *SysColumns) Update(tx *gorm.DB) (update SysColumns, err error) {
 
 	//参数1:是要修改的数据
 	//参数2:是修改的数据
+	e.UpdateBy = 0
 	if err = tx.Table("sys_columns").Model(&update).Updates(&e).Error; err != nil {
 		return
 	}

app/admin/models/tools/systables.go

@@ -34,8 +34,8 @@ type SysTables struct {
 	IsLogicalDelete     string       `gorm:"size:1;" json:"isLogicalDelete"`
 	LogicalDelete       bool         `gorm:"size:1;" json:"logicalDelete"`
 	LogicalDeleteColumn string       `gorm:"size:128;" json:"logicalDeleteColumn"`
-	CreateBy            string       `gorm:"size:128;" json:"createBy"`
-	UpdateBy            string       `gorm:"size:128;" json:"updateBy"`
+	CreateBy            int          `gorm:"size:128;" json:"createBy"`
+	UpdateBy            int          `gorm:"size:128;" json:"updateBy"`
 	DataScope           string       `gorm:"-" json:"dataScope"`
 	Params              Params       `gorm:"-" json:"params"`
 	Columns             []SysColumns `gorm:"-" json:"columns"`
@@ -134,6 +134,7 @@ func (e *SysTables) GetTree(tx *gorm.DB) ([]SysTables, error) {
 
 func (e *SysTables) Create(tx *gorm.DB) (SysTables, error) {
 	var doc SysTables
+	e.CreateBy = 0
 	result := tx.Table("sys_tables").Create(&e)
 	if result.Error != nil {
 		err := result.Error
@@ -156,6 +157,7 @@ func (e *SysTables) Update(tx *gorm.DB) (update SysTables, err error) {
 
 	//参数1:是要修改的数据
 	//参数2:是修改的数据
+	e.UpdateBy = 0
 	if err = tx.Table("sys_tables").Where("table_id = ?", e.TableId).Updates(&e).Error; err != nil {
 		return
 	}

app/admin/router/sys_config.go

@@ -21,7 +21,7 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
 		r.GET("/:id", api.GetSysConfig)
 		r.POST("", api.InsertSysConfig)
 		r.PUT("/:id", api.UpdateSysConfig)
-		r.DELETE("/:id", api.DeleteSysConfig)
+		r.DELETE("", api.DeleteSysConfig)
 	}
 
 	r1 := v1.Group("/configKey").Use(authMiddleware.MiddlewareFunc())
@@ -34,4 +34,4 @@ func registerSysConfigRouter(v1 *gin.RouterGroup, authMiddleware *jwt.GinJWTMidd
 		r2.GET("", api.GetSysConfigBySysApp)
 	}
 
-}
+}

app/admin/service/dto/sys_config.go

@@ -97,7 +97,7 @@ func (s *SysConfigById) Generate() *SysConfigById {
 }
 
 func (s *SysConfigById) GetId() interface{} {
-	return s.Id
+	return s.Ids
 }
 
 func (s *SysConfigById) Bind(ctx *gin.Context) error {
@@ -116,4 +116,4 @@ func (s *SysConfigById) Bind(ctx *gin.Context) error {
 
 func (s *SysConfigById) GenerateM() (*system.SysConfig, error) {
 	return &system.SysConfig{}, nil
-}
+}

app/admin/service/sys_config.go

@@ -104,7 +104,7 @@ func (e *SysConfig) RemoveSysConfig(d *dto.SysConfigById, c *system.SysConfig) e
 	var data system.SysConfig
 
 	db := e.Orm.Model(&data).
-		Where(d.GetId()).Delete(c)
+		Where(d.Ids).Delete(c)
 	if db.Error != nil {
 		err = db.Error
 		e.Log.Errorf("Service RemoveSysConfig error:%s", err)

common/actions/permission.go

@@ -71,7 +71,7 @@ func Permission(tableName string, p *DataPermission) func(db *gorm.DB) *gorm.DB
 		case "3":
 			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where dept_id = ? )", p.DeptId)
 		case "4":
-			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%"+pkg.IntToString(p.DeptId)+"%")
+			return db.Where(tableName+".create_by in (SELECT user_id from sys_user where sys_user.dept_id in(select dept_id from sys_dept where dept_path like ? ))", "%/"+pkg.IntToString(p.DeptId)+"/%")
 		case "5":
 			return db.Where(tableName+".create_by = ?", p.UserId)
 		default:

common/apis/api.go

@@ -17,14 +17,13 @@ type Api struct {
 	Logger  *logger.Logger
 }
 
-func (e Api) SetContext(c *gin.Context) {
+func (e *Api) SetContext(c *gin.Context) {
 	e.Context = c
-	e.Logger = api.GetRequestLogger(c)
 }
 
 // GetLogger 获取上下文提供的日志
 func (e Api) GetLogger() *logger.Logger {
-	return e.Logger
+	return api.GetRequestLogger(e.Context)
 }
 
 func (e Api) Bind(d interface{}, bindings ...binding.Binding) error {
@@ -71,4 +70,4 @@ func (e Api) PageOK(result interface{}, count int, pageIndex int, pageSize int,
 // Custom 兼容函数
 func (e Api) Custom(data gin.H) {
 	response.Custum(e.Context, data)
-}
+}

common/dto/generate.go

@@ -22,7 +22,7 @@ func (s *ObjectById) Bind(ctx *gin.Context) error {
 		return err
 	}
 	if ctx.Request.Method == http.MethodDelete {
-		err = ctx.ShouldBind(&s.Ids)
+		err = ctx.ShouldBind(&s)
 		if err != nil {
 			log.Warnf("ShouldBind error: %s", err.Error())
 			return err

common/global/adm.go

@@ -1,12 +1,12 @@
 package global
 
 const (
-	// go-admin Version Info
-	Version = "1.3.3"
+	// Version go-admin Version Info
+	Version = "1.3.5"
 )
 
 var (
 	Source string
 	Driver string
 	DBName string
-)
+)

go.mod

@@ -9,8 +9,8 @@ require (
 	github.com/bytedance/go-tagexpr/v2 v2.7.10
 	github.com/casbin/casbin/v2 v2.25.1
 	github.com/gin-gonic/gin v1.6.3
-	github.com/go-admin-team/go-admin-core v1.3.5-rc.0.0.20210423072631-e3580b68ee26
-	github.com/go-admin-team/go-admin-core/sdk v1.3.0-rc.3.0.20210427015751-b42693c49c6c
+	github.com/go-admin-team/go-admin-core v1.3.5-rc.1
+	github.com/go-admin-team/go-admin-core/sdk v1.3.5-rc.1
 	github.com/google/uuid v1.2.0
 	github.com/mssola/user_agent v0.5.2
 	github.com/opentracing/opentracing-go v1.1.0