diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java index feabc05..0d3c288 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/config/Constants.java @@ -144,6 +144,6 @@ public class Constants { /** * 禁止特殊字符正则表达式 */ - public static final String DISALLOWED_REGEX = ".*[!~`@#$%^&*()\\-_,.?\":{}|<>+\\\\/%].*"; + public static final String DISALLOWED_REGEX = ".*[!~`@#$%^&*()\\-_,.?\":{}|<>+\\\\/%].*"; } diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java index d91edca..ad64a7d 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbBdRecordServiceImpl.java @@ -229,14 +229,14 @@ public class TbBdRecordServiceImpl implements TbBdRecordService { redisService.setCacheObject(Constants.TB_BD_RECORD_REDIS_KEY, list, 10L, TimeUnit.MINUTES); } // 处理手机号解密 - if (list != null && list.size() > 0) { list.stream() .filter(tbBdRecord -> tbBdRecord.getDepartName() != null) .forEach(tbBdRecord -> tbBdRecord.setRelPhone(Sm4Utils.decode(tbBdRecord.getRelPhone()))); - } // 手动计算分页信息 - int pageNum = record.getPageNum() == 0 ? 1 : record.getPageNum(); - int pageSize = record.getPageSize() == 0 ? 10 : record.getPageSize(); + // 默认为第1页 + int pageNum = Math.max(record.getPageNum(), 1); + // 默认为10条数据一页 + int pageSize = Math.max(record.getPageSize(), 10); int total = list.size(); int totalPages = (int) Math.ceil((double) total / pageSize); // 手动分页,获取当前页的数据 diff --git a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java index 90d32fa..e0f0dbf 100644 --- a/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java +++ b/bonus-modules/base/src/main/java/com/bonus/base/basic/service/impl/TbProjectServiceImpl.java @@ -116,11 +116,6 @@ public class TbProjectServiceImpl implements TbProjectService { return null; } - public static void main(String[] args) { - String data = "测试工程0928#"; - System.out.println(data.matches(Constants.DISALLOWED_REGEX)); - } - /** * 修改数据 * diff --git a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml index 8b0807d..81dfdb6 100644 --- a/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml +++ b/bonus-modules/base/src/main/resources/mapper/base/basic/TbBdRecordMapper.xml @@ -94,7 +94,8 @@ update tb_bd_record - set del_flag = 1 + set del_flag = 1, + update_time = now(), where id = #{id}