From d802d890d6cd622ea3a33a5c88c80e6ba3ba41b4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=92=B1=E6=B6=9B?= <15850646081@163.com>
Date: Thu, 25 Apr 2024 11:45:37 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A4=84=E7=90=86=E8=A7=A3=E5=AF=86=E9=97=AE?=
 =?UTF-8?q?=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 resource/wiki/常用查询.md                     | 10 ++++++++++
 .../engine/salary/encrypt/AESEncryptUtil.java | 20 +++++++++++++++----
 2 files changed, 26 insertions(+), 4 deletions(-)
 create mode 100644 resource/wiki/常用查询.md

diff --git a/resource/wiki/常用查询.md b/resource/wiki/常用查询.md
new file mode 100644
index 000000000..0bb9db9a6
--- /dev/null
+++ b/resource/wiki/常用查询.md
@@ -0,0 +1,10 @@
+# 工资数据报表
+
+```` 
+select e.lastname,sob.name as 账套名, record.salary_month as 薪资月, item.name as 薪资项 ,result.result_value as 值
+from hrsa_salary_acct_record record 
+left join hrsa_salary_sob sob  on record.salary_sob_id = sob.id and sob.delete_type = 0  and record.delete_type = 0 
+left join hrsa_salary_acct_result result on record.id = result.salary_acct_record_id and result.delete_type = 0  and record.delete_type = 0 
+left join hrsa_salary_item item on result.salary_item_id = item.id and item.delete_type = 0 
+left join hrsa_tax_agent agent on agent.id=sob.tax_agent_id and agent.delete_type=0 
+left join hrmresource e on e.id= result.employee_id
diff --git a/src/com/engine/salary/encrypt/AESEncryptUtil.java b/src/com/engine/salary/encrypt/AESEncryptUtil.java
index e54ebea02..4ec7f60de 100644
--- a/src/com/engine/salary/encrypt/AESEncryptUtil.java
+++ b/src/com/engine/salary/encrypt/AESEncryptUtil.java
@@ -46,6 +46,14 @@ public class AESEncryptUtil {
             if (encryptStr.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) {
                 encryptStr = encryptStr.substring(4, encryptStr.length());
                 return AES.decrypt(encryptStr, aesEncryptScrect);
+            } else if (isNumeric(encryptStr) ||
+                    checkHaveChinese(encryptStr) ||
+                    encryptStr.startsWith("{") ||
+                    encryptStr.contains("-") ||
+                    encryptStr.contains(".") ||
+                    "null".equals(encryptStr) ||
+                    StringUtils.isBlank(encryptStr)) {
+                return encryptStr;
             } else {
                 return AES.decrypt(encryptStr, aesEncryptScrect);
             }
@@ -59,7 +67,7 @@ public class AESEncryptUtil {
      * @param encryptStr 加密字符串
      * @return 解密字符串
      */
-    public static String closeEncryptSetting(String encryptStr,SalarySysConfPO sysConfPo) {
+    public static String closeEncryptSetting(String encryptStr, SalarySysConfPO sysConfPo) {
         if (encryptStr == null) {
             return null;
         } else {
@@ -67,9 +75,13 @@ public class AESEncryptUtil {
             if (encryptStr.startsWith(SalarySysConstant.PRE_SIGN_ENCRYPT)) {
                 encryptStr = encryptStr.substring(4, encryptStr.length());
                 return AES.decrypt(encryptStr, aesEncryptScrect);
-            } else if (isNumeric(encryptStr) || checkHaveChinese(encryptStr) || encryptStr.startsWith("{") || encryptStr.contains("-") || encryptStr.contains(".")) {
-                return encryptStr;
-            } else if ("null".equals(encryptStr) || StringUtils.isBlank(encryptStr)) {
+            } else if (isNumeric(encryptStr) ||
+                    checkHaveChinese(encryptStr) ||
+                    encryptStr.startsWith("{") ||
+                    encryptStr.contains("-") ||
+                    encryptStr.contains(".") ||
+                    "null".equals(encryptStr) ||
+                    StringUtils.isBlank(encryptStr)) {
                 return encryptStr;
             } else if (sysConfPo == null || sysConfPo.getConfValue().equals(OpenEnum.OFF.getValue())) {
                 return AES.decrypt(encryptStr, aesEncryptScrect);