diff --git a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java index 8129f24..b955160 100644 --- a/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java +++ b/gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java @@ -78,13 +78,15 @@ public class BusinessTripApprovalController extends BaseController { dto.setDepartment(user.getDept().getDeptName()); List togUserIdList = dto.getTogUserIdList(); StringBuilder ids = new StringBuilder(); - for (Long aLong : togUserIdList) { - if (ids.length() > 0) { - ids.append(","); + if (togUserIdList != null && !togUserIdList.isEmpty()) { + for (Long aLong : togUserIdList) { + if (ids.length() > 0) { + ids.append(","); + } + ids.append(aLong); } - ids.append(aLong); + dto.setTogUserIds(ids.toString()); } - dto.setTogUserIds(ids.toString()); return toAjax(businessTripApprovalService.save(dto)); } diff --git a/gather-app/src/main/java/com/ruoyi/interceptor/DictionaryInterceptor.java b/gather-app/src/main/java/com/ruoyi/interceptor/DictionaryInterceptor.java index 4c34c29..2187110 100644 --- a/gather-app/src/main/java/com/ruoyi/interceptor/DictionaryInterceptor.java +++ b/gather-app/src/main/java/com/ruoyi/interceptor/DictionaryInterceptor.java @@ -60,6 +60,26 @@ public class DictionaryInterceptor implements Interceptor { } + if (StrUtil.equals(field.getName(), "startDate")) { + field.setAccessible(true); + Long passTime = (Long) field.get(obj); + try { + ReflectUtil.setFieldValue(obj, field.getName() + "Cn", DateUtil.format(DateUtil.date(passTime * 1000), DatePattern.NORM_DATETIME_PATTERN)); + } catch (Exception ignored) { + } + + } + + if (StrUtil.equals(field.getName(), "endDate")) { + field.setAccessible(true); + Long passTime = (Long) field.get(obj); + try { + ReflectUtil.setFieldValue(obj, field.getName() + "Cn", DateUtil.format(DateUtil.date(passTime * 1000), DatePattern.NORM_DATETIME_PATTERN)); + } catch (Exception ignored) { + } + + } + if (StrUtil.endWith(field.getName(), "Time") && field.getType().equals(Long.class)) { field.setAccessible(true); field.setAccessible(true);