删除门店时删除用户

blade-service-api/blade-user-api/src/main/java/org/springblade/system/user/feign/IUserClient.java

@@ -77,6 +77,7 @@ public interface IUserClient {
 	String SAVE_USER_AND_CAR_OWNER = API_PREFIX + "/saveUserAndCarOwner";
 
 	String UPDATE_CAR_OWNER_STORE_DATA = API_PREFIX + "/updateCarOwnerStoreData";
+	String REMOVE_USER_BY_IDS_AND_DEPT_ID = API_PREFIX + "/removeUserByIdsAndDeptId";
 
 	/**
 	 * 创建车主用户及车主与门店信息关联
@@ -352,4 +353,13 @@ public interface IUserClient {
 	R updateCarOwnerStoreData(@RequestBody CarOwner carOwner);
 
 
+	/**
+	 * 批量删除用户
+	 *
+	 * @param deptId 部门id
+	 * @param userIds 用户id集合
+	 * @return 结果
+	 */
+	@PostMapping(REMOVE_USER_BY_IDS_AND_DEPT_ID)
+	boolean removeUserByIdsAndDeptId(@RequestParam("deptId") String deptId, @RequestParam("userIds") List<Long> userIds);
 }

blade-service/blade-user/src/main/java/org/springblade/system/user/feign/UserClient.java

@@ -2,6 +2,7 @@
 package org.springblade.system.user.feign;
 
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
+import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
 import com.baomidou.mybatisplus.core.toolkit.ObjectUtils;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.gubersail.dealer.admin.api.fegin.IGoodsBrandClient;
@@ -541,6 +542,11 @@ public class UserClient implements IUserClient {
 		return R.success("操作成功");
 	}
 
+	@Override
+	public boolean removeUserByIdsAndDeptId(String deptId, List<Long> userIds) {
+		return service.remove(new LambdaUpdateWrapper<User>().eq(User::getDeptId, deptId).in(User::getId, userIds));
+	}
+
 
 	private Dept handleDepartment(String customerName, User srcUser, List<Dept> dealerDeptList,
 								  Long parentId, String tenantId, List<Dept> updateDeptList) {

blade-service/gubersail-dealer-admin/src/main/java/com/gubersail/admin/corp/controller/CorpsDescController.java

@@ -159,6 +159,13 @@ public class CorpsDescController extends BladeController {
 		if (!corpsAttnList.isEmpty()) {
 			List<Long> attnIds = corpsAttnList.stream().map(PjCorpsAttn::getId).collect(Collectors.toList());
 			corpsAttnService.removeByIds(attnIds);
+			List<Long> userIds = corpsAttnList.stream().map(PjCorpsAttn::getUserId).collect(Collectors.toList());
+			if (!userIds.isEmpty()) {
+				boolean success = userClient.removeUserByIdsAndDeptId(AuthUtil.getDeptId(),userIds);
+				if (!success) {
+					return R.data(500, "删除用户失败", "error");
+				}
+			}
 		}
 		List<PjCorpsAddr> corpsAddrList = corpsAddrService.list(new LambdaQueryWrapper<PjCorpsAddr>()
 			.in(PjCorpsAddr::getPid, corpsDesc.getId()));