|
@@ -23,6 +23,7 @@ import org.springframework.web.bind.annotation.RequestMapping;
|
|
|
import java.util.ArrayList;
|
|
|
import java.util.List;
|
|
|
import java.util.Map;
|
|
|
+import java.util.Set;
|
|
|
import java.util.stream.Collectors;
|
|
|
|
|
|
/**
|
|
@@ -118,14 +119,17 @@ public class InitController {
|
|
|
|
|
|
initUserSubList.addAll(userSubs);
|
|
|
|
|
|
-
|
|
|
});
|
|
|
}
|
|
|
|
|
|
+ // 消除
|
|
|
+ List<SysUserSub> currSub = userSubService.list();
|
|
|
+ Set<Integer> currIds = currSub.stream().mapToInt(SysUserSub::getUserId).boxed().collect(Collectors.toSet());
|
|
|
+ List<SysUserSub> pureNew = initUserSubList.stream().filter(sysUserSub -> !currIds.contains(sysUserSub.getUserId())).collect(Collectors.toList());
|
|
|
|
|
|
- // 初始化user_sub
|
|
|
|
|
|
- userSubService.saveBatch(initUserSubList);
|
|
|
+ // 初始化user_sub
|
|
|
+ userSubService.saveBatch(pureNew);
|
|
|
|
|
|
|
|
|
return R.ok(Boolean.TRUE);
|