空指针校验

flow-oauth/flow-oauth-biz/src/main/java/com/flow/service/impl/UserDetailsServiceImpl.java

@@ -5,9 +5,7 @@ import com.flow.dao.AuthDao;
 import com.flow.entity.OauthUserDetails;
 import com.flow.entity.Role;
 import com.flow.entity.User;
-import com.google.common.collect.Sets;
 import lombok.extern.slf4j.Slf4j;
-import org.checkerframework.checker.nullness.qual.Nullable;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.context.annotation.Primary;
 import org.springframework.security.core.GrantedAuthority;
@@ -18,7 +16,6 @@ import org.springframework.security.core.userdetails.UsernameNotFoundException;
 import org.springframework.stereotype.Service;
 
 import java.util.HashSet;
-import java.util.List;
 import java.util.Optional;
 import java.util.Set;
 import java.util.stream.Collectors;

flow-workflow/flow-workflow-biz/src/main/java/com/flow/service/impl/FlowTaskServiceImpl.java

@@ -329,8 +329,11 @@ public class FlowTaskServiceImpl extends BaseServiceImpl<FlowTaskDao, FlowTask>
         Map<String, Object> values = taskForm.getValues();
         if(CollectionUtils.isNotEmpty(values)){
             values.forEach((key, value) -> {
-                if (variables.containsKey(key) && !variables.get(key).equals(value)) {
-                    transientVariables.put(key, value);
+                if (variables.containsKey(key)){
+                    Object obj = variables.get(key);
+                    if(Objects.nonNull(obj) && !obj.equals(value)){
+                        transientVariables.put(key, value);
+                    }
                 }
             });
         }

flow-workflow/flow-workflow-entity/src/main/java/com/flow/entity/node/Node.java

@@ -10,7 +10,6 @@ import com.flow.common.core.exception.BaseException;
 import com.flow.constant.NodeTypeConstant;
 import com.google.common.collect.Lists;
 import lombok.Data;
-import org.flowable.bpmn.model.EventListener;
 import org.flowable.bpmn.model.FlowElement;
 import org.flowable.bpmn.model.FlowableListener;
 import org.flowable.bpmn.model.SequenceFlow;