From f3916678796e7824ab911aceb53ba08bde07049e Mon Sep 17 00:00:00 2001
From: wucongxing <815046773@qq.com>
Date: Thu, 6 Jul 2023 11:36:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=A7=92=E8=89=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 api/controller/adminRole.go  | 13 +++++++++----
 api/controller/department.go | 15 ++-------------
 api/service/department.go    | 17 +++++++++++++++++
 3 files changed, 28 insertions(+), 17 deletions(-)
 create mode 100644 api/service/department.go

diff --git a/api/controller/adminRole.go b/api/controller/adminRole.go
index dfccf66..6ec90ed 100644
--- a/api/controller/adminRole.go
+++ b/api/controller/adminRole.go
@@ -187,14 +187,19 @@ func (r *Role) GetRole(c *gin.Context) {
 		return
 	}
 
-	// 获取角色身份
-	roleService := service.RoleService{}
-	isAdmin, err := roleService.GetRoleIden(c)
-	if err != nil {
+	// 获取角色数据
+	adminRoleDao := dao.AdminRoleDao{}
+	adminRole, err := adminRoleDao.GetAdminRoleFirstById(roleId)
+	if err != nil || adminRole == nil {
 		responses.FailWithMessage(err.Error(), c)
 		return
 	}
 
+	isAdmin := false
+	if adminRole.IsAdmin == 1 {
+		isAdmin = true
+	}
+
 	RoleService := service.RoleService{}
 	adminRole, menuIds, err := RoleService.GetRole(roleId, isAdmin)
 	if err != nil {
diff --git a/api/controller/department.go b/api/controller/department.go
index e075899..cdbf9e5 100644
--- a/api/controller/department.go
+++ b/api/controller/department.go
@@ -3,10 +3,8 @@ package controller
 
 import (
 	"github.com/gin-gonic/gin"
-	"hospital-admin-api/api/dao"
 	"hospital-admin-api/api/requests"
 	"hospital-admin-api/api/responses"
-	"hospital-admin-api/api/responses/hosDepCustomResponse"
 	"hospital-admin-api/global"
 	"hospital-admin-api/utils"
 )
@@ -27,16 +25,7 @@ func (b *Department) GetDepartmentCustomList(c *gin.Context) {
 		return
 	}
 
-	hospitalDepartmentCustomDao := dao.HospitalDepartmentCustom{}
-
-	maps := make(map[string]interface{})
-	hospitalDepartmentCustom, err := hospitalDepartmentCustomDao.GetHospitalDepartmentCustomList(maps)
-	if err != nil {
-		responses.FailWithMessage(err.Error(), c)
-		return
-	}
-
 	// 处理返回值
-	getDepartmentListResponse := hosDepCustomResponse.GetHospitalDepartmentCustomListResponse(hospitalDepartmentCustom)
-	responses.OkWithData(getDepartmentListResponse, c)
+	// getDepartmentListResponse := hosDepCustomResponse.GetHospitalDepartmentCustomListResponse(hospitalDepartmentCustom)
+	// responses.OkWithData(getDepartmentListResponse, c)
 }
diff --git a/api/service/department.go b/api/service/department.go
new file mode 100644
index 0000000..7257d5c
--- /dev/null
+++ b/api/service/department.go
@@ -0,0 +1,17 @@
+package service
+
+type DepartmentService struct{}
+
+// // GetDepartmentCustomList 获取自定义科室列表
+// func (r *DepartmentService) GetDepartmentCustomList(departmentRequest requests.GetDepartmentCustomList) (bool, error) {
+// 	hospitalDepartmentCustomDao := dao.HospitalDepartmentCustom{}
+//
+// 	maps := make(map[string]interface{})
+// 	if departmentRequest.DepartmentId != "" {
+// 		maps["department_id"] = departmentRequest.DepartmentId
+// 	}
+// 	hospitalDepartmentCustom, err := hospitalDepartmentCustomDao.GetHospitalDepartmentCustomList(maps)
+// 	if err != nil {
+//
+// 	}
+// }