From c6d0356319144592940a722cb470a7aedca38146 Mon Sep 17 00:00:00 2001
From: junvary <junvary@foxmail.com>
Date: Fri, 14 Jul 2023 08:05:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E7=B3=BB=E7=BB=9F=E5=86=85?=
 =?UTF-8?q?=E7=BD=AE=E5=8F=AF=E4=BB=A5=E7=BC=96=E8=BE=91=E7=9A=84=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 GQA-BACKEND/service/private/dept.go | 6 +++---
 GQA-BACKEND/service/private/dict.go | 6 +++---
 GQA-BACKEND/service/private/menu.go | 6 +++---
 GQA-BACKEND/service/private/role.go | 6 +++---
 4 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/GQA-BACKEND/service/private/dept.go b/GQA-BACKEND/service/private/dept.go
index 392f6e3..85fadc8 100644
--- a/GQA-BACKEND/service/private/dept.go
+++ b/GQA-BACKEND/service/private/dept.go
@@ -45,12 +45,12 @@ func (s *ServiceDept) GetDeptList(requestDeptList model.RequestGetDeptList) (err
 
 func (s *ServiceDept) EditDept(toEditDept model.SysDept) (err error) {
 	var sysDept model.SysDept
-	if sysDept.Stable == "yesNo_yes" {
-		return errors.New(utils.GqaI18n("StableCantDo") + toEditDept.DeptCode)
-	}
 	if err = global.GqaDb.Where("id = ?", toEditDept.Id).First(&sysDept).Error; err != nil {
 		return err
 	}
+	if sysDept.Stable == "yesNo_yes" {
+		return errors.New(utils.GqaI18n("StableCantDo") + toEditDept.DeptCode)
+	}
 	//err = global.GqaDb.Updates(&toEditDept).Error
 	err = global.GqaDb.Save(&toEditDept).Error
 	return err
diff --git a/GQA-BACKEND/service/private/dict.go b/GQA-BACKEND/service/private/dict.go
index 124e6f0..7400855 100644
--- a/GQA-BACKEND/service/private/dict.go
+++ b/GQA-BACKEND/service/private/dict.go
@@ -49,12 +49,12 @@ func (s *ServiceDict) GetDictList(requestDictList model.RequestGetDictList) (err
 
 func (s *ServiceDict) EditDict(toEditDict model.SysDict) (err error) {
 	var sysDict model.SysDict
-	if sysDict.Stable == "yesNo_yes" {
-		return errors.New(utils.GqaI18n("StableCantDo") + toEditDict.DictCode)
-	}
 	if err = global.GqaDb.Where("id = ?", toEditDict.Id).First(&sysDict).Error; err != nil {
 		return err
 	}
+	if sysDict.Stable == "yesNo_yes" {
+		return errors.New(utils.GqaI18n("StableCantDo") + toEditDict.DictCode)
+	}
 	//err = global.GqaDb.Updates(&toEditDict).Error
 	err = global.GqaDb.Save(&toEditDict).Error
 	return err
diff --git a/GQA-BACKEND/service/private/menu.go b/GQA-BACKEND/service/private/menu.go
index f9f9680..fdfba20 100644
--- a/GQA-BACKEND/service/private/menu.go
+++ b/GQA-BACKEND/service/private/menu.go
@@ -44,12 +44,12 @@ func (s *ServiceMenu) GetMenuList(requestMenuList model.RequestGetMenuList) (err
 
 func (s *ServiceMenu) EditMenu(toEditMenu model.SysMenu) (err error) {
 	var sysMenu model.SysMenu
-	if sysMenu.Stable == "yesNo_yes" {
-		return errors.New(utils.GqaI18n("StableCantDo") + toEditMenu.Title)
-	}
 	if err = global.GqaDb.Where("id = ?", toEditMenu.Id).First(&sysMenu).Error; err != nil {
 		return err
 	}
+	if sysMenu.Stable == "yesNo_yes" {
+		return errors.New(utils.GqaI18n("StableCantDo") + toEditMenu.Title)
+	}
 	//先删除关联button表中menu_name的记录
 	var menuButton model.SysButton
 	if err = global.GqaDb.Where("menu_name = ?", toEditMenu.Name).Delete(&menuButton).Error; err != nil {
diff --git a/GQA-BACKEND/service/private/role.go b/GQA-BACKEND/service/private/role.go
index 77d075d..4abe3d5 100644
--- a/GQA-BACKEND/service/private/role.go
+++ b/GQA-BACKEND/service/private/role.go
@@ -33,12 +33,12 @@ func (s *ServiceRole) GetRoleList(requestRoleList model.RequestGetRoleList) (err
 
 func (s *ServiceRole) EditRole(toEditRole model.SysRole) (err error) {
 	var sysRole model.SysRole
-	if sysRole.Stable == "yesNo_yes" {
-		return errors.New(utils.GqaI18n("StableCantDo") + toEditRole.RoleCode)
-	}
 	if err = global.GqaDb.Where("id = ?", toEditRole.Id).First(&sysRole).Error; err != nil {
 		return err
 	}
+	if sysRole.Stable == "yesNo_yes" {
+		return errors.New(utils.GqaI18n("StableCantDo") + toEditRole.RoleCode)
+	}
 	//err = global.GqaDb.Updates(&toEditRole).Error
 	err = global.GqaDb.Save(&toEditRole).Error
 	return err