Commit 2fb85b77 by chamberone

Merge branch 'develop' of https://zhangguoping@gitlab.dituhui.com/bsh/project/pr…

…oject.git into develop
2 parents 0ded5f26 722254c0
...@@ -155,7 +155,9 @@ public class EngineerServiceImpl implements EngineerService { ...@@ -155,7 +155,9 @@ public class EngineerServiceImpl implements EngineerService {
Set<String> sInput = new HashSet<>(skillGroupIds); Set<String> sInput = new HashSet<>(skillGroupIds);
Set<String> sDB = new HashSet<>(engineerSkills.getOrDefault(engineerCode, new ArrayList<>())); Set<String> sDB = new HashSet<>(engineerSkills.getOrDefault(engineerCode, new ArrayList<>()));
log.info("before sInput:{}, sDB:{}", sInput, sDB);
sInput.removeAll(sDB); sInput.removeAll(sDB);
log.info("after sInput:{}", sInput);
for (String skillGroupId : sInput) { for (String skillGroupId : sInput) {
EngineerSkillGroup e = new EngineerSkillGroup(); EngineerSkillGroup e = new EngineerSkillGroup();
e.setEngineerCode(engineerCode); e.setEngineerCode(engineerCode);
......
Markdown is supported
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!