diff --git a/pkg/app/server/controller/departhandler.go b/pkg/app/server/controller/departhandler.go index 94d7625fb724688bb3a098d71a00faccfa19a81b..f9a823ade3003833c0fc9602aac5f82abb0f03d8 100644 --- a/pkg/app/server/controller/departhandler.go +++ b/pkg/app/server/controller/departhandler.go @@ -92,30 +92,47 @@ func AddDepartHandler(c *gin.Context) { } func DeleteDepartDataHandler(c *gin.Context) { - var DelDept dao.DeleteDepart + var DelDept service.DeleteDepart if err := c.Bind(&DelDept); err != nil { response.Fail(c, nil, "parameter error") return } + + //TODO: + var user service.User + log := auditlog.NewAuditLog(auditlog.LogTypeOrganize, "删除部门信息", "", user) + auditlog.AddAuditLog(log) + err := service.DeleteDepartData(&DelDept) if err != nil { + auditlog.UpdateStatus(log, auditlog.StatusFail) response.Fail(c, nil, err.Error()) return } + + auditlog.UpdateStatus(log, auditlog.StatusSuccess) response.Success(c, nil, "部门删除成功") } func UpdateDepartHandler(c *gin.Context) { - var new dao.NewDepart + var new service.NewDepart if err := c.Bind(&new); err != nil { response.Fail(c, nil, "parameter error") return } + //TODO: + var user service.User + log := auditlog.NewAuditLog(auditlog.LogTypeOrganize, "修改部门信息", "", user) + auditlog.AddAuditLog(log) + err := service.UpdateDepart(new.DepartID, new.DepartName) if err != nil { + auditlog.UpdateStatus(log, auditlog.StatusFail) response.Fail(c, nil, err.Error()) return } + + auditlog.UpdateStatus(log, auditlog.StatusSuccess) response.Success(c, nil, "部门更新成功") } diff --git a/pkg/app/server/controller/userhandler.go b/pkg/app/server/controller/userhandler.go index cc304ee5acd4c3a2da592f0a65556cf4a01ffca7..45ed94ed0c2395eac92cb05b5109806a1b206aa7 100644 --- a/pkg/app/server/controller/userhandler.go +++ b/pkg/app/server/controller/userhandler.go @@ -81,6 +81,11 @@ func LoginHandler(c *gin.Context) { // 退出 func Logout(c *gin.Context) { + //TODO: + var user service.User + log := auditlog.NewAuditLog(auditlog.LogTypeUser, "用户注销", "", user) + auditlog.AddAuditLog(log) + auditlog.UpdateStatus(log, auditlog.StatusSuccess) response.Success(c, nil, "退出成功!") } diff --git a/pkg/app/server/service/departservice.go b/pkg/app/server/service/departservice.go index e8171d3cfa4525bbdc1cc930e360efcd8c75bcc1..63a29e08d795d0ac61f96386a744c2d9002f3883 100644 --- a/pkg/app/server/service/departservice.go +++ b/pkg/app/server/service/departservice.go @@ -26,6 +26,11 @@ import ( ) type AddDepart = dao.AddDepart +<<<<<<< HEAD +type DeleteDepart = dao.DeleteDepart +======= +type NewDepart = dao.NewDepart +>>>>>>> bd15f9d (Add audit logs for the updatedepart methods) // 返回全部的部门指针数组 func Returnptrchild(depart []dao.DepartNode) (ptrchild []*dao.DepartTreeNode, deptRoot dao.DepartTreeNode) {