Merge branch 'develop' into release

tuoheng-admin/src/main/java/com/tuoheng/admin/service/impl/WorkOrderServiceImpl.java

@@ -80,7 +80,7 @@ public class WorkOrderServiceImpl extends BaseServiceImpl<WorkOrderMapper, WorkO
                 .like(StringUtils.isNotEmpty(request.getCode()), WorkOrder::getCode, request.getCode())
                 .eq(ObjectUtil.isNotEmpty(request.getStatus()), WorkOrder::getStatus, request.getStatus())
                 .between(ObjectUtil.isNotNull(startDate),WorkOrder::getCreateTime, startDate, endDate)
-                .apply(1 == request.getHandleFlag(),"FIND_IN_SET(" + ShiroUtils.getUserId()+",assign_user)")
+                .apply((null != request.getHandleFlag() && 1 == request.getHandleFlag()),"FIND_IN_SET(" + ShiroUtils.getUserId()+",assign_user)")
                 .eq(WorkOrder::getMark, MarkTypeEnum.VALID.getCode())
                 .orderByDesc(WorkOrder::getCreateTime));