public/PandaX
1
0
Fork 0
mirror of https://gitee.com/XM-GO/PandaX.git synced 2026-04-23 10:58:35 +08:00
Code Issues Packages Projects Releases Wiki Activity

任务，通知功能完成

Browse Source
This commit is contained in:
PandaGoAdmin
2021-12-26 22:24:44 +08:00
parent 816791f148
commit e85bbbc030
17 changed files with 48 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
apps/system/services/menu.go
View File

@@ -168,19 +168,6 @@ func (m *sysMenuModelImpl) GetMenuRole(data entity.MenuRole) *[]entity.MenuRole
return &menus
}
//func (m *sysMenuModelImpl) InitPaths(menu *entity.SysMenu) {
// parentMenu := new(entity.SysMenu)
// if int(menu.ParentId) != 0 {
// parentMenu = m.FindOne(menu.ParentId)
// biz.IsTrue(parentMenu.Paths != "", "父级paths异常，请尝试对当前节点父级菜单进行更新操作！")
// menu.Paths = parentMenu.Paths + "/" + kgo.KConv.Int2Str(menu.MenuId)
// } else {
// menu.Paths = "/0/" + kgo.KConv.Int2Str(menu.MenuId)
// }
// global.Db.Table(m.table).Where("menu_id = ?", menu.MenuId).Update("paths", menu.Paths)
// return
//}
func DiguiMenu(menulist *[]entity.SysMenu, menu entity.SysMenu) entity.SysMenu {
list := *menulist
@@ -201,6 +188,7 @@ func DiguiMenu(menulist *[]entity.SysMenu, menu entity.SysMenu) entity.SysMenu {
mi.Permission = list[j].Permission
mi.ParentId = list[j].ParentId
mi.IsAffix = list[j].IsAffix
mi.IsIframe = list[j].IsIframe
mi.IsLink = list[j].IsLink
mi.Component = list[j].Component
mi.Sort = list[j].Sort

4
apps/system/services/notice.go
View File

@@ -50,7 +50,7 @@ func (m *sysNoticeModelImpl) FindListPage(page, pageSize int, data entity.SysNot
db = db.Where("notice_type = ?", data.NoticeType)
}
if len(data.DeptIds) > 0 {
db = db.Where("`dept_id` in (?)", data.DeptIds)
db = db.Where("dept_id in (?)", data.DeptIds)
}
db.Where("delete_time IS NULL")
err := db.Count(&total).Error
@@ -65,5 +65,5 @@ func (m *sysNoticeModelImpl) Update(data entity.SysNotice) *entity.SysNotice {
}
func (m *sysNoticeModelImpl) Delete(postIds []int64) {
biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.SysNotice{}, "`notice_id` in (?)", postIds).Error, "删除通知失败")
biz.ErrIsNil(global.Db.Table(m.table).Delete(&entity.SysNotice{}, "notice_id in (?)", postIds).Error, "删除通知失败")
}