日志、菜单修改

app/system/controller/tenant.go

@@ -40,7 +40,7 @@ func (c *tenant) GetDetail(ctx *gin.Context) {
 func (c *tenant) List(ctx *gin.Context) {
 	current, _ := strconv.Atoi(ctx.Query("current"))
 	size, _ := strconv.Atoi(ctx.Query("size"))
-	tenantId := ctx.Query("tenantId")
+	tId := ctx.Query("tenantId")
 	tenantName := ctx.Query("tenantName")
 	linkman := ctx.Query("linkman")
 	if current == 0 {
@@ -50,12 +50,12 @@ func (c *tenant) List(ctx *gin.Context) {
 		size = 10
 	}
 
-	tId, err := strconv.Atoi(tenantId)
-	if err != nil {
-		ctx.JSON(http.StatusOK, common.ParamsInvalidResponse(err.Error(), nil))
-		return
+	tenantId := -1
+	if tId != "" {
+		tenantId, _ = strconv.Atoi(tId)
 	}
-	tenants, err := service.TenantService.List(tId, tenantName, linkman, current, size)
+
+	tenants, err := service.TenantService.List(tenantId, tenantName, linkman, current, size)
 	if err != nil {
 		ctx.JSON(http.StatusOK, err)
 		return

app/system/service/menuService.go

@@ -4,6 +4,7 @@ import (
 	"iot_manager_service/app/system/dao"
 	"iot_manager_service/app/system/model"
 	"iot_manager_service/util/common"
+	"sort"
 )
 
 var MenuService = new(menuService)
@@ -100,7 +101,12 @@ func (s *menuService) Routes(roleId int64) ([]model.MenuRouteDetail, error) {
 	}
 	roots, _ := tmp[0]
 	rsp = menuDfs(rsp, roots, tmp)
-
+	sort.Slice(rsp, func(i, j int) bool {
+		if rsp[i].Sort < rsp[j].Sort {
+			return true
+		}
+		return false
+	})
 	return rsp, nil
 }
 

main.go

@@ -41,6 +41,7 @@ func initDB() {
 		db.DB().SetMaxOpenConns(32)
 		db.DB().SetMaxIdleConns(5)
 		db.LogMode(false)
+		db.SetLogger(logger.Logger)
 	}
 	device.InitDB(db)
 	system.InitDB(db)

router/router.go

@@ -392,6 +392,7 @@ func InitRouter(engine *gin.Engine) {
 		tenant.POST("/submit", system.Tenant.Submit)
 		tenant.POST("/remove", system.Tenant.Remove)
 		tenant.POST("/select", system.Tenant.GetList)
+		tenant.GET("/list", system.Tenant.List)
 	}
 
 	//角色