From 1c4935c13c44f35bc59e77cff6a66e3131a35d94 Mon Sep 17 00:00:00 2001
From: zhaowenxuan <chacca165@163.com>
Date: 星期四, 27 二月 2025 17:56:21 +0800
Subject: [PATCH] 修改同步

---
 ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java |   10 ++++++----
 1 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
index 9b9ffe8..4e42584 100644
--- a/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
+++ b/ltkj-admin/src/main/java/com/ltkj/web/controller/system/DictCompController.java
@@ -91,9 +91,11 @@
     @Log(title = "浣撴鍗曚綅淇℃伅缁存姢", businessType = BusinessType.INSERT)
     @PostMapping
     public AjaxResult add(@RequestBody DictComp dictComp) {
-        String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
-        dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
-        dictComp.setEnName(firstLetter);
+        if(null !=dictComp.getCnName()){
+            String firstLetter = PinyinUtil.getFirstLetter(dictComp.getCnName(), "");
+            dictComp.setWbm(MatchUtils.toWubi(dictComp.getCnName()));
+            dictComp.setEnName(firstLetter);
+        }
         return toAjax(dictCompService.save(dictComp));
     }
 
@@ -130,7 +132,7 @@
         if(null !=name)wq.eq(TjReservation::getName,name);
         if(null !=deptId)wq.eq(TjReservation::getDepartment,deptId);
         if(null !=reservationTime)wq.between(TjReservation::getReservationTime, DateUtil.beginOfDay(reservationTime),DateUtil.endOfDay(reservationTime));
-//        IPage<TjReservation> iPage = reservationService.page(pages, wq);
+        wq.eq(TjReservation::getIsExpire,"2");
         return AjaxResult.success(reservationService.list(wq));
     }
 

--
Gitblit v1.8.0