|
@@ -280,6 +280,21 @@ public class WeComController {
|
|
|
.collect(Collectors.toList());
|
|
|
}
|
|
|
nStrings.removeAll(collect);
|
|
|
+ //循环差集多出来的人,有没有之前就已经在数据库存在的(调岗逻辑)
|
|
|
+ List<String> tgStrings = new ArrayList<>();
|
|
|
+ for (String nString : nStrings) {
|
|
|
+ List<BladeUser> tgList = bladeUserService.list(new LambdaQueryWrapper<BladeUser>()
|
|
|
+ .eq(BladeUser::getThirdUserId, nString)
|
|
|
+ );
|
|
|
+ if(tgList.size()>0){
|
|
|
+ for (BladeUser bladeUser : tgList) {
|
|
|
+ bladeUser.setDeptId(dept.getId().toString());
|
|
|
+ }
|
|
|
+ bladeUserService.updateBatchById(tgList);
|
|
|
+ tgStrings.add(nString);
|
|
|
+ }
|
|
|
+ }
|
|
|
+ nStrings.removeAll(tgStrings);
|
|
|
List<BladeUser> batchList = new ArrayList<>();
|
|
|
for (int j1 = 0; j1 < userList.size(); j1++) {
|
|
|
JSONObject userObject = userList.getJSONObject(j1);
|
|
@@ -392,7 +407,7 @@ public class WeComController {
|
|
|
.eq(BladeUserDept::getUserId, bladeUser.getId())
|
|
|
.eq(BladeUserDept::getDeptId, id)
|
|
|
);
|
|
|
- if(depts.size() > 0){
|
|
|
+ if(depts.size() == 0){
|
|
|
continue;
|
|
|
}else {
|
|
|
BladeUserDept bladeUserDept = new BladeUserDept();
|