Merge remote-tracking branch 'origin/master_0929' into master_0929

@@ -167,6 +167,10 @@ public class ContractDistributorStandardServiceImpl extends
     public ContractDistributorStandard findById(String id) {
 
         ContractDistributorStandard data = getBaseMapper().selectById(id);
+        if (data == null) {
+            return null;
+        }
+
         // 获取当前人员的待办任务数据
         List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
         if (CollectionUtils.isEmpty(flowTaskList)) {