修复residentialController install报错

blade-service/community/pom.xml

@@ -50,11 +50,11 @@
             <version>2.7.2.RELEASE</version>
             <scope>compile</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springblade</groupId>
-            <artifactId>system-expand</artifactId>
-            <version>2.7.2.RELEASE</version>
-        </dependency>
+<!--        <dependency>-->
+<!--            <groupId>org.springblade</groupId>-->
+<!--            <artifactId>system-expand</artifactId>-->
+<!--            <version>2.7.2.RELEASE</version>-->
+<!--        </dependency>-->
         <dependency>
             <groupId>org.springblade</groupId>
             <artifactId>blade-system</artifactId>

blade-service/community/src/main/java/org/springblade/community/controller/ResidentialController.java

@@ -42,8 +42,6 @@ import org.springblade.system.expand.entity.OrgPosition;
 import org.springblade.system.expand.entity.Street;
 import org.springblade.system.expand.feign.IOrgPositionClient;
 import org.springblade.system.expand.feign.IStreetClient;
-import org.springblade.system.expand.service.IOrgPositionService;
-import org.springblade.system.expand.utils.QueryWrapperUtil;
 import org.springblade.system.feign.ISysClient;
 import org.springframework.core.ParameterizedTypeReference;
 import org.springframework.http.HttpEntity;
@@ -81,7 +79,6 @@ public class ResidentialController extends BladeController {
 	private ISysClient sysClient;
 	private IStreetClient streetClient;
 
-	private IOrgPositionService orgPositionService;
 
 
 	/**
@@ -102,7 +99,17 @@ public class ResidentialController extends BladeController {
 	@ApiOperationSupport(order = 2)
 	@ApiOperation(value = "分页", notes = "传入residential")
 	public R<IPage<ResidentialVO>> list(@RequestParam Map<String,Object> residential, Query query, BladeUser bladeUser) {
-		LambdaQueryWrapper<Residential> wrapper = new QueryWrapperUtil<Residential>().getBasicQueryWrapperByMap(orgPositionService,Residential::getOrgPosition,residential, new Residential(),bladeUser);
+		String deptId = bladeUser.getDeptId();
+		String[] deptIds = deptId.split(",");
+		LambdaQueryWrapper<Residential> wrapper = Condition.getQueryWrapper(residential,Residential.class).lambda();
+		for (int i = 0; i < deptIds.length; i++) {
+			OrgPosition orgPosition = orgPositionClient.getByOrgId(deptIds[i]);
+			if (i == 0) {
+				wrapper.like(Residential::getOrgPosition,orgPosition.getOrgPosition());
+			}else{
+				wrapper.or().like(Residential::getOrgPosition,orgPosition.getOrgPosition());
+			}
+		}
 
 		//获取角色信息
 		R<Role> role = sysClient.getRole(Long.valueOf(bladeUser.getRoleId()));

blade-service/system-expand/src/main/java/org/springblade/system/expand/utils/QueryWrapperUtil.java

@@ -1,48 +0,0 @@
-package org.springblade.system.expand.utils;
-
-import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
-import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
-import com.baomidou.mybatisplus.core.toolkit.support.SFunction;
-import org.springblade.core.mp.support.Condition;
-import org.springblade.core.secure.BladeUser;
-import org.springblade.system.expand.entity.OrgPosition;
-import org.springblade.system.expand.service.IOrgPositionService;
-
-import java.util.Map;
-
-
-public class QueryWrapperUtil<T> {
-
-	public LambdaQueryWrapper<T> getBasicQueryWrapper(IOrgPositionService orgPositionService, SFunction<T, String> function, T t, BladeUser bladeUser){
-
-
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<T> wrapper = Condition.getQueryWrapper(t).lambda();
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionService.getBaseMapper().selectOne(new QueryWrapper<>(new OrgPosition()).lambda().eq(OrgPosition::getOrgId,deptIds[i]));
-			if (i == 0) {
-				wrapper.like(function,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(function,orgPosition.getOrgPosition());
-			}
-		}
-		return wrapper;
-	}
-
-	public LambdaQueryWrapper<T> getBasicQueryWrapperByMap(IOrgPositionService orgPositionService, SFunction<T, String> function, Map map, T t, BladeUser bladeUser){
-
-		String deptId = bladeUser.getDeptId();
-		String[] deptIds = deptId.split(",");
-		LambdaQueryWrapper<T> wrapper = Condition.getQueryWrapper(map,t.getClass()).lambda();
-		for (int i = 0; i < deptIds.length; i++) {
-			OrgPosition orgPosition = orgPositionService.getBaseMapper().selectOne(new QueryWrapper<>(new OrgPosition()).lambda().eq(OrgPosition::getOrgId,deptIds[i]));
-			if (i == 0) {
-				wrapper.like(function,orgPosition.getOrgPosition());
-			}else{
-				wrapper.or().like(function,orgPosition.getOrgPosition());
-			}
-		}
-		return wrapper;
-	}
-}