diff --git a/src/app/server/network/controller/machine.go b/src/app/server/network/controller/machine.go
index 1dfd7037391fa5538e77377f948d77f08e43177b..ae19adb2b27093193c354ad34045a0f01bf5d12a 100644
--- a/src/app/server/network/controller/machine.go
+++ b/src/app/server/network/controller/machine.go
@@ -108,31 +108,10 @@ func ModifyMachineDepartHandler(c *gin.Context) {
 	response.Success(c, nil, "机器部门修改成功")
 }
 
-// 改变机器维护状态
-func UpdateMaintStatus(c *gin.Context) {
-	var M struct {
-		MachineIDs  string `json:"machineids"`
-		MaintStatus string `json:"maintstatus"`
-	}
-	if err := c.Bind(&M); err != nil {
-		response.Fail(c, nil, "parameter error")
-		return
-	}
-	result, err := machineservice.UpdateMaintStatus(M.MachineIDs, M.MaintStatus)
-	if err != nil {
-		response.Fail(c, nil, err.Error())
-		return
-	}
-	if len(result) != 0 {
-		response.Fail(c, result, err.Error())
-	}
-	response.Success(c, nil, "机器维护状态修改成功")
-}
-
 // 维护状态列表
 func MaintStatusList(c *gin.Context) {
 	var datas []string
 	datas = append(datas, machineservice.NormalStatus)
 	datas = append(datas, machineservice.MaintenanceStatus)
-	response.Success(c, datas, "机器维护状态修改成功")
+	response.Success(c, datas, "机器维护状态列表")
 }
diff --git a/src/app/server/network/controller/web_terminal.go b/src/app/server/network/controller/web_terminal.go
index ee16dc5ebc3de1e6168a720945bba9f0e6ac8fea..3bf42965810566d74b0315e76dadfe0cbd611af8 100644
--- a/src/app/server/network/controller/web_terminal.go
+++ b/src/app/server/network/controller/web_terminal.go
@@ -26,6 +26,7 @@ import (
 	"github.com/gorilla/websocket"
 )
 
+// 终端连接功能删除
 func WS(c *gin.Context) {
 	// 升级协议并获得socket连接
 	conn, err := Websocket.Upgrader.Upgrade(c.Writer, c.Request, nil)
diff --git a/src/app/server/network/httpserver.go b/src/app/server/network/httpserver.go
index 8c0d3efbe73951169ecb29626f6ab2a7b43476b7..9cb58646a82018df13ebac560f0e4d797965ca8d 100644
--- a/src/app/server/network/httpserver.go
+++ b/src/app/server/network/httpserver.go
@@ -276,7 +276,7 @@ func registerAPIs(router *gin.Engine) {
 
 	userLog := api.Group("log") // 日志管理
 	{
-		userLog.GET("/log_all", middleware.NeedPermission("log", "menu"), controller.LogAllHandler)
+		userLog.GET("/log_all", middleware.NeedPermission("audit", "menu"), controller.LogAllHandler)
 		userLog.GET("/log_child", controller.GetAuditLogByIdHandler)
 	}
 
diff --git a/src/app/server/service/auth/casbin.go b/src/app/server/service/auth/casbin.go
index 065a19535c79026ead65996af4644b49ac8a5c0b..18769a896af002370a90d15e20f3fa097a229a08 100644
--- a/src/app/server/service/auth/casbin.go
+++ b/src/app/server/service/auth/casbin.go
@@ -130,7 +130,7 @@ var (
 		"batch",
 		"usermanager",
 		"rolemanager",
-		"log",
+		"audit",
 		"plugin",
 	}
 )
diff --git a/src/app/server/service/batch/batch.go b/src/app/server/service/batch/batch.go
index d82300d61da62842d8b168472d2d5a0940c73fa2..cf96fb80ef4313d96621f8b76b6edcfd5859d380 100644
--- a/src/app/server/service/batch/batch.go
+++ b/src/app/server/service/batch/batch.go
@@ -147,6 +147,15 @@ func UpdateBatch(batchid int, name, description string) error {
 
 // 分页获取某批次的机器信息
 func GetBatchMachines(offset, size, batchid int) (int64, []dao.MachineNode, error) {
+	//检查批次id是否存在
+	isExist, err := dao.IsExistID(batchid)
+	if !isExist {
+		return 0, nil, errors.New("批次不存在")
+	}
+	if err != nil {
+		return 0, nil, err
+	}
+
 	count, machineIdlist, err := dao.GetMachineIDPaged(offset, size, batchid)
 	if err != nil {
 		return 0, nil, err
diff --git a/src/app/server/service/cluster/cluster.go b/src/app/server/service/cluster/cluster.go
index 0106c6c36758e171146796973ac9b57a12f2f7fb..a62491460d5e08e43d301f802a62b60e75a6664f 100644
--- a/src/app/server/service/cluster/cluster.go
+++ b/src/app/server/service/cluster/cluster.go
@@ -31,7 +31,7 @@ type DepartMachineInfo struct {
 }
 
 type AgentStatus struct {
-	Normal  int `json:"normal"`
+	Online  int `json:"normal"` //normal显示的是在线机器数量，前端字段需要做修改
 	OffLine int `json:"offline"`
 	Free    int `json:"free"`
 }
@@ -58,8 +58,7 @@ func ClusterInfo() (ClusterInfoParam, error) {
 		return data, err
 	}
 
-	//Normal显示的事在线机器数量，前端字段需要做修改
-	data.AgentStatus.Normal = online
+	data.AgentStatus.Online = online
 	data.AgentStatus.OffLine = offline
 	data.AgentStatus.Free = maint
 	return data, nil
@@ -85,11 +84,13 @@ func DepartClusterInfo() []DepartMachineInfo {
 		if err != nil {
 			logger.Error(err.Error())
 		}
+
+		//TODO:各部门中不存在维护状态的机器，应该统计正常使用的机器的数量，只有根节点下才会存在维护状态的机器
 		maint, err := dao.CountMaintStatus(machine.MaintenanceStatus, depart.ID)
 		if err != nil {
 			logger.Error(err.Error())
 		}
-		departInfo.AgentStatus.Normal = online
+		departInfo.AgentStatus.Online = online
 		departInfo.AgentStatus.OffLine = offline
 		departInfo.AgentStatus.Free = maint
 
diff --git a/src/app/server/service/depart/depart.go b/src/app/server/service/depart/depart.go
index 728ab29d8c46e940389d3ef5cc52cd3849c1d3ad..b5c46a8aaa7030f5b061ef514ce737c2527715c5 100644
--- a/src/app/server/service/depart/depart.go
+++ b/src/app/server/service/depart/depart.go
@@ -143,7 +143,7 @@ func DepartInfo() (*DepartTreeNode, error) {
 	if len(depart) == 0 {
 		return nil, errors.New("当前无部门节点")
 	}
-	//返回所有根节点喝孩子节点
+	//返回所有根节点和孩子节点
 	ptrchild, departRoot := Returnptrchild(depart)
 	//构造树
 	MakeTree(&departRoot, ptrchild)
@@ -241,11 +241,29 @@ func DeleteDepart(DelDept *DeleteDeparts) error {
 
 // 更改部门名字
 func UpdateDepart(DepartID int, DepartName string) error {
+	//查看该部门是否存在
+	temp, err := dao.GetDepartById(DepartID)
+	if err != nil {
+		return err
+	}
+	if temp.ID == 0 {
+		return errors.New("不存在该部门")
+	}
 	return dao.UpdateDepart(DepartID, DepartName)
 }
 
 // 获取部门下所有机器列表
 func MachineList(DepId int) ([]dao.Res, error) {
+	//查看该部门是否存在
+	temp, err := dao.GetDepartById(DepId)
+	if err != nil {
+		return nil, err
+	}
+	if temp.ID == 0 {
+		return nil, errors.New("不存在该部门")
+	}
+
+	//查询所有子节点
 	var departId []int
 	ReturnSpecifiedDepart(DepId, &departId)
 	departId = append(departId, DepId)
diff --git a/src/app/server/service/internal/dao/roledao.go b/src/app/server/service/internal/dao/roledao.go
index 8f10ed76bf00f2f2e2c22f2618046ffb95cca798..d1a777dd717ac02155867fce2ef93b1b675b3b3d 100644
--- a/src/app/server/service/internal/dao/roledao.go
+++ b/src/app/server/service/internal/dao/roledao.go
@@ -15,7 +15,6 @@
 package dao
 
 import (
-	"fmt"
 	"strings"
 	"time"
 
@@ -71,10 +70,6 @@ func GetRoles() ([]Role, error) {
 
 // 新增角色
 func AddRole(r *Role) error {
-	if r.Name == "" {
-		return fmt.Errorf("角色名不能为空")
-	}
-
 	return mysqlmanager.MySQL().Save(r).Error
 }
 
diff --git a/src/app/server/service/role/role.go b/src/app/server/service/role/role.go
index 6ccc4c2cb97abaafaf64f9b05a9dcad41f33a3a3..26412569b199d50f53dfb0e5b90df29c86ef689b 100644
--- a/src/app/server/service/role/role.go
+++ b/src/app/server/service/role/role.go
@@ -109,6 +109,14 @@ func getRoleMenuButtons(role string) map[string]interface{} {
 
 // 添加角色
 func AddRole(userRole *Role) error {
+	if userRole.Name == "" {
+		return errors.New("role name can not be empty")
+	}
+
+	id, _ := dao.GetRoleId(userRole.Name)
+	if id > 0 {
+		return errors.New("role name already exists")
+	}
 	err := dao.AddRole(userRole)
 	if err != nil {
 		return err