java/zhihuishenqu.git

			@@ -2,7 +2,6 @@

			import static java.util.Objects.isNull;
			import static java.util.Objects.nonNull;
			import static org.apache.commons.lang3.StringUtils.isBlank;
			import static org.apache.commons.lang3.StringUtils.isNotBlank;
			import static org.apache.commons.lang3.StringUtils.isNotEmpty;

			@@ -18,6 +17,7 @@
			import org.springframework.stereotype.Service;
			import org.springframework.transaction.annotation.Transactional;

			import com.alibaba.fastjson.JSONArray;
			import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
			import com.baomidou.mybatisplus.core.metadata.IPage;
			import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
			@@ -33,6 +33,7 @@
			import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportExcelVO;
			import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberImportMistakeExcelVO;
			import com.panzhihua.common.model.vos.community.fms.ComFmsTeamMemberVO;
			import com.panzhihua.common.service.user.UserService;
			import com.panzhihua.service_community.dao.ComFmsTeamDAO;
			import com.panzhihua.service_community.dao.ComFmsTeamMemberDAO;
			import com.panzhihua.service_community.dao.ComFmsTeamMemberRelationDAO;
			@@ -61,6 +62,8 @@
			private ComFmsTeamMemberRelationDAO comFmsTeamMemberRelationDAO;
			@Resource
			private ComFmsTeamTypeDAO comFmsTeamTypeDAO;
			@Resource
			private UserService userService;

			/**
			* 新增团队成员
			@@ -193,7 +196,18 @@
			.eq(ComFmsTeamMemberRelation::getMemberId, deleteTeamMemberDTO.getId()).eq(ComFmsTeamMemberRelation::getTeamId, deleteTeamMemberDTO.getTeamId()));
			if (num > 0) {
			if (count == 1) {
			//只存在一个团队中直接删除
			this.baseMapper.deleteById(deleteTeamMemberDTO.getId());
			// 删除用户信息缓存
			userService.deleteUserCashByPhone(comFmsTeamMember.getPhone());
			} else {
			//存在多个团队中，删除与该团队关联
			ComFmsTeam fmsTeam = comFmsTeamDAO.selectById(deleteTeamMemberDTO.getTeamId());
			String cascadeIds = comFmsTeamMember.getCascadeIds();
			List<List> lists = JSONArray.parseArray(cascadeIds, List.class);
			List<List> collect = lists.stream().filter(e -> !e.toString().equals(Arrays.asList(fmsTeam.getTeamType(), fmsTeam.getId()).toString())).collect(Collectors.toList());
			comFmsTeamMember.setCascadeIds(collect.toString());
			this.baseMapper.updateById(comFmsTeamMember);
			}
			return R.ok();
			}