|
@@ -9,6 +9,7 @@ import com.ozs.system.mapper.SysDeptMapper;
|
|
|
import com.ozs.system.mapper.SysDeptOrganMapper;
|
|
|
import com.ozs.system.service.SysDeptOrganService;
|
|
|
import org.apache.commons.lang3.ObjectUtils;
|
|
|
+import org.apache.poi.ss.formula.functions.T;
|
|
|
import org.springframework.beans.factory.annotation.Autowired;
|
|
|
import org.springframework.stereotype.Service;
|
|
|
|
|
@@ -69,8 +70,17 @@ public class SysDeptOrganServiceImpl implements SysDeptOrganService {
|
|
|
LambdaQueryWrapper<SysDeptOrgan> wrapper = new LambdaQueryWrapper<>();
|
|
|
wrapper.eq(SysDeptOrgan::getDeptId, deptOrganList.get(0).getDeptId());
|
|
|
List<SysDeptOrgan> organs = deptOrganMapper.selectList(wrapper);
|
|
|
- List<String> organNameList = organs.stream().map(SysDeptOrgan::getOrganName).collect(Collectors.toList());
|
|
|
+ List<Long> idList = organs.stream().map(SysDeptOrgan::getId).collect(Collectors.toList());
|
|
|
+ for (SysDeptOrgan organ : deptOrganList) {
|
|
|
+ if (!idList.contains(organ.getId())) {
|
|
|
+ deptOrganMapper.deleteById(organ.getId());
|
|
|
+ }
|
|
|
+ }
|
|
|
|
|
|
+ LambdaQueryWrapper<SysDeptOrgan> wrapperT = new LambdaQueryWrapper<>();
|
|
|
+ wrapperT.eq(SysDeptOrgan::getDeptId, deptOrganList.get(0).getDeptId());
|
|
|
+ List<SysDeptOrgan> organsT = deptOrganMapper.selectList(wrapperT);
|
|
|
+ List<String> organNameList = organsT.stream().map(SysDeptOrgan::getOrganName).collect(Collectors.toList());
|
|
|
for (SysDeptOrgan organ : deptOrganList) {
|
|
|
if (!organNameList.contains(organ.getOrganName())) {
|
|
|
organ.setCreateBy(String.valueOf(userId));
|