From f726c07c182065d637ec8a3363479a047966cdf8 Mon Sep 17 00:00:00 2001
From: memorylkf <312904636@qq.com>
Date: Mon, 2 Feb 2026 17:59:37 +0800
Subject: [PATCH] =?UTF-8?q?fix:=20[=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../controller/StudySubjectController.java         |  2 +-
 .../business/service/IStudySubjectService.java     |  2 +-
 .../service/impl/ArchiveLogServiceImpl.java        | 22 +++++++++++-----------
 .../service/impl/StudySubjectServiceImpl.java      |  2 +-
 .../system/service/impl/SysMenuServiceImpl.java    | 12 ++++++------
 5 files changed, 20 insertions(+), 20 deletions(-)

diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudySubjectController.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudySubjectController.java
index c01cba6..81fcded 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudySubjectController.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/controller/StudySubjectController.java
@@ -79,7 +79,7 @@ public class StudySubjectController extends BaseController
     @GetMapping("/isQa")
     public AjaxResult isQa()
     {
-        return AjaxResult.success(studySubjectService.isQA());
+        return AjaxResult.success(studySubjectService.isQa());
     }
 
 
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySubjectService.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySubjectService.java
index 838755e..9102673 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySubjectService.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/IStudySubjectService.java
@@ -51,6 +51,6 @@ public interface IStudySubjectService extends IService<StudySubject>
      * 判断是否是QA部门的用户
      * @return
      */
-    Boolean isQA();
+    Boolean isQa();
 
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ArchiveLogServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ArchiveLogServiceImpl.java
index e8d73a6..d085003 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ArchiveLogServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/ArchiveLogServiceImpl.java
@@ -70,19 +70,19 @@ public class ArchiveLogServiceImpl extends ServiceImpl<ArchiveLogMapper, Archive
     }
 
     private String getOperateTypeEn(String operateType){
-        return operateType.equals("申请归档")?"Apply for Archiving"
-                :operateType.equals("同意归档")?"Approve Archiving"
-                :operateType.equals("拒绝归档")?"Reject Archiving"
+        return "申请归档".equals(operateType)?"Apply for Archiving"
+                :"同意归档".equals(operateType)?"Approve Archiving"
+                :"拒绝归档".equals(operateType)?"Reject Archiving"
 
-                :operateType.equals("申请解档")?"Apply for De-archiving"
-                :operateType.equals("同意解档")?"Approve De-archiving"
-                :operateType.equals("拒绝解档")?"Reject De-archiving"
+                :"申请解档".equals(operateType)?"Apply for De-archiving"
+                :"同意解档".equals(operateType)?"Approve De-archiving"
+                :"拒绝解档".equals(operateType)?"Reject De-archiving"
 
-                :operateType.equals("申请借阅")?"Apply for Check-out"
-                :operateType.equals("同意借阅")?"Approve Check-out"
-                :operateType.equals("拒绝借阅")?"Reject Check-out"
+                :"申请借阅".equals(operateType)?"Apply for Check-out"
+                :"同意借阅".equals(operateType)?"Approve Check-out"
+                :"拒绝借阅".equals(operateType)?"Reject Check-out"
 
-                :operateType.equals("确认归还")?"Check-out End Confirmation"
-                :operateType.equals("到期自动归还")?"Check-out End on Time":"";
+                :"确认归还".equals(operateType)?"Check-out End Confirmation"
+                :"到期自动归还".equals(operateType)?"Check-out End on Time":"";
     }
 }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java
index 6b663f2..6ddb99d 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/business/service/impl/StudySubjectServiceImpl.java
@@ -222,7 +222,7 @@ public class StudySubjectServiceImpl extends ServiceImpl<StudySubjectMapper, Stu
     }
 
     @Override
-    public Boolean isQA() {
+    public Boolean isQa() {
         Long qaDeptId = 216L;
         return sysUserService.selectUserById(SecurityUtils.getUserId()).getDeptId().equals(qaDeptId);
     }
diff --git a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java
index 45c47c7..208b26b 100644
--- a/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java
+++ b/hxhq-modules/hxhq-system/src/main/java/com/hxhq/system/service/impl/SysMenuServiceImpl.java
@@ -582,20 +582,20 @@ public class SysMenuServiceImpl implements ISysMenuService
         }
         if(!info.getMenuType().equals(old.getMenuType())){
             SystemLog log = getLogInfo();
-            log.setJcnr("[{\"name\":\"字段名\",\"value\":\"菜单类型\"},{\"name\":\"原值\",\"value\":\""+(old.getMenuType().equals("M")?"目录":old.getMenuType().equals("C")?"菜单":"按钮")+"\"},{\"name\":\"新值\",\"value\":\""+(info.getMenuType().equals("M")?"目录":info.getMenuType().equals("C")?"菜单":"按钮")+"\"}]");
-            log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Type\"},{\"name\":\"Old Value\",\"value\":\""+(old.getMenuType().equals("M")?"Dir":old.getMenuType().equals("C")?"Menu":"Btn")+"\"},{\"name\":\"New Value\",\"value\":\""+(info.getMenuType().equals("M")?"Dir":info.getMenuType().equals("C")?"Menu":"Btn")+"\"}]");
+            log.setJcnr("[{\"name\":\"字段名\",\"value\":\"菜单类型\"},{\"name\":\"原值\",\"value\":\""+("M".equals(old.getMenuType())?"目录":"C".equals(old.getMenuType())?"菜单":"按钮")+"\"},{\"name\":\"新值\",\"value\":\""+("M".equals(info.getMenuType())?"目录":"C".equals(info.getMenuType())?"菜单":"按钮")+"\"}]");
+            log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Type\"},{\"name\":\"Old Value\",\"value\":\""+("M".equals(old.getMenuType())?"Dir":"C".equals(old.getMenuType())?"Menu":"Btn")+"\"},{\"name\":\"New Value\",\"value\":\""+("M".equals(info.getMenuType())?"Dir":"C".equals(info.getMenuType())?"Menu":"Btn")+"\"}]");
             list.add(log);
         }
         if(!info.getStatus().equals(old.getStatus())){
             SystemLog log = getLogInfo();
-            log.setJcnr("[{\"name\":\"字段名\",\"value\":\"菜单状态\"},{\"name\":\"原值\",\"value\":\""+(old.getMenuType().equals("0")?"显示":"隐藏")+"\"},{\"name\":\"新值\",\"value\":\""+(info.getMenuType().equals("0")?"显示":"隐藏")+"\"}]");
-            log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Status\"},{\"name\":\"Old Value\",\"value\":\""+(old.getMenuType().equals("0")?"Visible":"Hide")+"\"},{\"name\":\"New Value\",\"value\":\""+(info.getMenuType().equals("0")?"Visible":"Hide")+"\"}]");
+            log.setJcnr("[{\"name\":\"字段名\",\"value\":\"菜单状态\"},{\"name\":\"原值\",\"value\":\""+("0".equals(old.getMenuType())?"显示":"隐藏")+"\"},{\"name\":\"新值\",\"value\":\""+("0".equals(info.getMenuType())?"显示":"隐藏")+"\"}]");
+            log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Status\"},{\"name\":\"Old Value\",\"value\":\""+("0".equals(old.getMenuType())?"Visible":"Hide")+"\"},{\"name\":\"New Value\",\"value\":\""+("0".equals(info.getMenuType())?"Visible":"Hide")+"\"}]");
             list.add(log);
         }
         if(!info.getIsCache().equals(old.getIsCache())){
             SystemLog log = getLogInfo();
-            log.setJcnr("[{\"name\":\"字段名\",\"value\":\"是否缓存\"},{\"name\":\"原值\",\"value\":\""+(old.getIsCache().equals("0")?"缓存":"不缓存")+"\"},{\"name\":\"新值\",\"value\":\""+(info.getIsCache().equals("0")?"缓存":"不缓存")+"\"}]");
-            log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Cache Or Not\"},{\"name\":\"Old Value\",\"value\":\""+(old.getIsCache().equals("0")?"Cache":"No Cache")+"\"},{\"name\":\"New Value\",\"value\":\""+(info.getIsCache().equals("0")?"Cache":"No Cache")+"\"}]");
+            log.setJcnr("[{\"name\":\"字段名\",\"value\":\"是否缓存\"},{\"name\":\"原值\",\"value\":\""+("0".equals(old.getIsCache())?"缓存":"不缓存")+"\"},{\"name\":\"新值\",\"value\":\""+("0".equals(info.getIsCache())?"缓存":"不缓存")+"\"}]");
+            log.setJcnrEn("[{\"name\":\"Field\",\"value\":\"Cache Or Not\"},{\"name\":\"Old Value\",\"value\":\""+("0".equals(old.getIsCache())?"Cache":"No Cache")+"\"},{\"name\":\"New Value\",\"value\":\""+("0".equals(info.getIsCache())?"Cache":"No Cache")+"\"}]");
             list.add(log);
         }
         return list;