通话记录

hjzx-api/src/main/java/api/controller/call/CallLogController.java

@@ -68,7 +68,11 @@ public class CallLogController extends BaseController {
         qw.le(!StringHelper.isEmpty(input.getEndTime()) , CallLog::getCreateTime, input.getEndTime());
         if (isNote.equals("1"))
         {
-            qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
+            qw.and(wq -> {
+                wq.eq(CallLog::getNote,1);
+                wq.or().isNull(CallLog::getNote);
+            });
+           // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
         }
 
 
@@ -195,7 +199,11 @@ public class CallLogController extends BaseController {
         qw.eq(input.getMyd() != null , CallLog::getMyd, input.getMyd());
         if (isNote.equals("1"))
         {
-            qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
+            qw.and(wq -> {
+                wq.eq(CallLog::getNote,1);
+                wq.or().isNull(CallLog::getNote);
+            });
+            // qw.eq(CallLog::getNote, 1).or().isNull(CallLog::getNote);
         }
         qw.eq(!StringHelper.isEmpty(input.getWorkordercode()), CallLog::getWorkordercode, input.getWorkordercode());
         qw.orderByDesc(CallLog::getId);

hjzx-api/src/main/java/api/controller/order/WorkOrderBaseController.java

@@ -116,7 +116,7 @@ public class WorkOrderBaseController extends BaseController {
 
 
         qw.like(!StringHelper.isEmpty(input.getWorkordercode()), WorkOrderBase::getWorkordercode, input.getWorkordercode());
-        qw.eq(input.getProject() != null && input.getArea() > 0, WorkOrderBase::getArea, input.getArea());
+        qw.eq(input.getArea() != null && input.getArea() > 0, WorkOrderBase::getArea, input.getArea());
         qw.eq(input.getRestartsnum() != null && input.getRestartsnum() >= 0, WorkOrderBase::getRestartsnum, input.getRestartsnum());
         qw.eq(input.getProject() != null && input.getProject() > 0, WorkOrderBase::getProject, input.getProject());
         qw.eq(input.getWorkordercate() != null && input.getWorkordercate() > 0, WorkOrderBase::getWorkordercate, input.getWorkordercate());