处理解密问题
This commit is contained in:
parent
794ed55c7d
commit
d802d890d6
|
|
@ -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
|
||||
|
|
@ -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);
|
||||
|
|
|
|||
Loading…
Reference in New Issue