feat: Department management, if there are users under the Department, it should not be deleted(#103)
This commit is contained in:
1 parent
f83ee71745
commit
bd161114f0
2 files changed
+41
No files matched your search
@@ -204,6 +204,13 @@ func (e *Dept) Update(id int) (update Dept, err error) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (e *Dept) Delete(id int) (success bool, err error) {
|
func (e *Dept) Delete(id int) (success bool, err error) {
|
||||||
|
|
||||||
|
user := SysUser{}
|
||||||
|
user.DeptId = id
|
||||||
|
userlist, err := user.GetList()
|
||||||
|
tools.HasError(err, "", 500)
|
||||||
|
tools.Assert(len(userlist) <= 0, "当前部门存在用户,不能删除!",500)
|
||||||
|
|
||||||
if err = orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", id).Delete(&Dept{}).Error; err != nil {
|
if err = orm.Eloquent.Table(e.TableName()).Where("dept_id = ?", id).Delete(&Dept{}).Error; err != nil {
|
||||||
success = false
|
success = false
|
||||||
return
|
return
|
||||||
|
|||||||
@@ -159,6 +159,40 @@ func (e *SysUser) GetUserInfo() (SysUserView SysUserView, err error) {
|
|||||||
return
|
return
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (e *SysUser) GetList() (SysUserView []SysUserView, err error) {
|
||||||
|
|
||||||
|
table := orm.Eloquent.Table(e.TableName()).Select([]string{"sys_user.*", "sys_role.role_name"})
|
||||||
|
table = table.Joins("left join sys_role on sys_user.role_id=sys_role.role_id")
|
||||||
|
if e.UserId != 0 {
|
||||||
|
table = table.Where("user_id = ?", e.UserId)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.Username != "" {
|
||||||
|
table = table.Where("username = ?", e.Username)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.Password != "" {
|
||||||
|
table = table.Where("password = ?", e.Password)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.RoleId != 0 {
|
||||||
|
table = table.Where("role_id = ?", e.RoleId)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.DeptId != 0 {
|
||||||
|
table = table.Where("dept_id = ?", e.DeptId)
|
||||||
|
}
|
||||||
|
|
||||||
|
if e.PostId != 0 {
|
||||||
|
table = table.Where("post_id = ?", e.PostId)
|
||||||
|
}
|
||||||
|
|
||||||
|
if err = table.Find(&SysUserView).Error; err != nil {
|
||||||
|
return
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) {
|
func (e *SysUser) GetPage(pageSize int, pageIndex int) ([]SysUserPage, int, error) {
|
||||||
var doc []SysUserPage
|
var doc []SysUserPage
|
||||||
table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table(e.TableName())
|
table := orm.Eloquent.Select("sys_user.*,sys_dept.dept_name").Table(e.TableName())
|
||||||
|
|||||||
Reference in new issue
Block a user