Merge remote-tracking branch 'remotes/origin/develop' into feature/addSiArchivesBaseInfo_sy

This commit is contained in:
sy 2022-10-11 14:50:12 +08:00
commit 0688b86cc2
1 changed files with 5 additions and 1 deletions

View File

@ -40,7 +40,11 @@ public class AESEncryptUtil {
* @return
*/
private static String getSalarySysConfigValue() {
return salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT).getConfValue();
String confValue = salarySysConfService.getOneByCode(SalarySysConstant.OPEN_APPLICATION_ENCRYPT).getConfValue();
if (StringUtils.isEmpty(confValue)) {
return "1";
}
return confValue;
}
/**