云殇忆 1 jaar geleden
bovenliggende
commit
3d57f2a375

+ 3 - 0
ruoyi-demo/src/main/java/com/ruoyi/demo/controller/WorkTableController.java

@@ -153,6 +153,9 @@ public class WorkTableController {
         String userId = userid.toString();
         if (userId == null || userId.equals(""))
             return R.fail("请登录");
+        if (vo.getClueId() != null)
+            if ("".equals(vo.getClueId()))
+                return R.fail("线索id不能为空");
         return R.ok(businessOpportunitiesService.searchFollowList(vo, userId));
     }
 

+ 4 - 2
ruoyi-demo/src/main/java/com/ruoyi/demo/service/impl/BusinessOpportunitiesServiceImpl.java

@@ -52,9 +52,11 @@ public class BusinessOpportunitiesServiceImpl implements BusinessOpportunitiesSe
     @Override
     public PageInfo<List<FollowUpRecordBo>> searchFollowList(WorkTableSearchVo workVo, String userId) {
         PageHelper.startPage(workVo.getPageNum(), workVo.getPageSize(), true);
-        if (workVo.getStartTime() != null || workVo.getStartTime().equals(""))
+        if (workVo.getStartTime() != null)
+            if (workVo.getStartTime().equals(""))
                 workVo.setStartTime(null);
-        if (workVo.getEndTime() != null || workVo.getEndTime().equals(""))
+        if (workVo.getEndTime() != null)
+            if (workVo.getEndTime().equals(""))
                 workVo.setEndTime(null);
 
         List<FollowUpRecord> records = followUpDao.searchAllByMulti(workVo.getClueId(), workVo.getText(), workVo.getStartTime(), workVo.getEndTime(), userId);