From a3ba78d7bd6448e1afa6f3fe47bea6262cfe8cda Mon Sep 17 00:00:00 2001
From: 疯狂的狮子li <15040126243@163.com>
Date: 星期三, 25 五月 2022 10:37:33 +0800
Subject: [PATCH] fix 修复脱敏实现逻辑问题

---
 ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java      |    4 ++--
 ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java |    2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java
index 55c4e6a..404f393 100644
--- a/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java
+++ b/ruoyi-common/src/main/java/com/ruoyi/common/jackson/SensitiveJsonSerializer.java
@@ -27,9 +27,9 @@
     public void serialize(String value, JsonGenerator gen, SerializerProvider serializers) throws IOException {
         SensitiveService sensitiveService = SpringUtils.getBean(SensitiveService.class);
         if (sensitiveService.isSensitive()) {
-            gen.writeString(value);
-        } else {
             gen.writeString(strategy.desensitizer().apply(value));
+        } else {
+            gen.writeString(value);
         }
 
     }
diff --git a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java
index 08d4cc4..fe142ca 100644
--- a/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java
+++ b/ruoyi-system/src/main/java/com/ruoyi/system/service/impl/SysSensitiveServiceImpl.java
@@ -20,7 +20,7 @@
      */
     @Override
     public boolean isSensitive() {
-        return LoginHelper.isAdmin();
+        return !LoginHelper.isAdmin();
     }
 
 }

--
Gitblit v1.9.3