diff --git a/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java b/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java index f75a331a0bb43ee819d88ed9461d3b9373fdafb1..dfa8b6702754fc7c48a8f8c564adc216fd6cf89f 100644 --- a/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java +++ b/xfg-dev-tech-app/src/main/java/cn/bugstack/xfg/dev/tech/plugin/FieldEncryptionAndDecryptionMybatisPlugin.java @@ -41,22 +41,26 @@ public class FieldEncryptionAndDecryptionMybatisPlugin implements Interceptor { Object parameter = args[1]; String sqlId = mappedStatement.getId(); - if (parameter != null && (sqlId.contains("insert") || sqlId.contains("update")) ) { + if (parameter != null && (sqlId.contains("insert") || sqlId.contains("update"))) { String columnName = "employeeName"; if (parameter instanceof Map) { List parameterList = (List) ((Map) parameter).get("list"); for (Object obj : parameterList) { if (hasField(obj, columnName)) { String fieldValue = BeanUtils.getProperty(obj, columnName); - String encryptedValue = encrypt(fieldValue); - BeanUtils.setProperty(obj, columnName, encryptedValue); + if (StringUtils.isNoneBlank(fieldValue)) { + String encryptedValue = encrypt(fieldValue); + BeanUtils.setProperty(obj, columnName, encryptedValue); + } } } } else { if (hasField(parameter, columnName)) { String fieldValue = BeanUtils.getProperty(parameter, columnName); - String encryptedValue = encrypt(fieldValue); - BeanUtils.setProperty(parameter, columnName, encryptedValue); + if (StringUtils.isNoneBlank(fieldValue)) { + String encryptedValue = encrypt(fieldValue); + BeanUtils.setProperty(parameter, columnName, encryptedValue); + } } } } diff --git a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java index af2394275b62f10e9ec0b400a9dcd270ed336a35..a9d04740bd0550f49fe9b517bafaae111b161484 100644 --- a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java +++ b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/ApiTest.java @@ -7,8 +7,8 @@ import java.util.Base64; public class ApiTest { - private static final String KEY = "1234567890123456"; // 密钥,必须是16位 - private static final String IV = "1234567890123456"; // 偏移量,必须是16位 + private static final String KEY = "1234567890123456"; + private static final String IV = "1234567890123456"; public static void main(String[] args) throws Exception { System.out.println("哈喽,小卡拉米,欢迎加入小傅哥的学习阵营。https://bugstack.cn/md/road-map/road-map.html"); diff --git a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java index b939be4b4f38e396019017bf3218154a9784df5a..4edc958512a51577b4d3868bbc4423e0c5c303b3 100644 --- a/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java +++ b/xfg-dev-tech-app/src/test/java/cn/bugstack/xfg/dev/tech/test/domain/ISalaryAdjustApplyServiceTest.java @@ -27,7 +27,7 @@ public class ISalaryAdjustApplyServiceTest { public void test_execSalaryAdjust() { AdjustSalaryApplyOrderAggregate adjustSalaryApplyOrderAggregate = AdjustSalaryApplyOrderAggregate.builder() .employeeNumber("10000001") - .orderId("100908977676001") + .orderId("100908977676002") .employeeEntity(EmployeeEntity.builder().employeeLevel(EmployeePostVO.T3).employeeTitle(EmployeePostVO.T3).build()) .employeeSalaryAdjustEntity(EmployeeSalaryAdjustEntity.builder() .adjustTotalAmount(new BigDecimal(100))