DeBugDeBugDeBug

purchase-admin/src/main/java/com/ozs/web/controller/home/HomeNoticeController.java

@@ -68,11 +68,11 @@ public class HomeNoticeController extends BaseController {
         if (!StringUtils.isBlank(homeNoticeVo.getHomepageClassification())) {
             lw.eq(HomeNotice::getHomepageClassification, homeNoticeVo.getHomepageClassification());
         }
-        if (!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())) {
-            lw.ge(HomeNotice::getNoticeTime, homeNoticeVo.getNoticeTime());
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getBeginTime())) {
+            lw.ge(HomeNotice::getNoticeTime, homeNoticeVo.getBeginTime());
         }
-        if (!ObjectUtils.isEmpty(homeNoticeVo.getNoticeTime())) {
-            lw.le(HomeNotice::getNoticeTime, homeNoticeVo.getNoticeTime());
+        if (!ObjectUtils.isEmpty(homeNoticeVo.getEndTime())) {
+            lw.le(HomeNotice::getNoticeTime, homeNoticeVo.getEndTime());
         }
         IPage<HomeNotice> page = homeNoticeService.page(new Page<HomeNotice>(homeNoticeVo.getPageNum(), homeNoticeVo.getPageSize()), lw);
         return success(page);

purchase-system/src/main/java/com/ozs/plan/service/impl/PlanYearsServiceImpl.java

@@ -395,6 +395,7 @@ public class PlanYearsServiceImpl extends ServiceImpl<PlanYearsMapper, PlanYears
                                 }
                             }
                         }
+                        //去掉末尾的标点符号
                         String zs = zBuilder.toString();
                         if (zs.endsWith(",")) {
                             zBuilder.replace(0, zBuilder.length(), "");