fix: 调整为精确类型

project-interface/src/main/java/com/dituhui/pea/order/IOrganization.java

@@ -8,6 +8,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RequestParam;
 
 
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
+import com.dituhui.pea.pojo.OrganizationDTO;
 
 
 /**
 /**
  * 组织结构相关接口
  * 组织结构相关接口
@@ -24,7 +25,7 @@ public interface IOrganization {
 	 * @return
 	 * @return
 	 */
 	 */
 	@RequestMapping(value = "/pea-order/organization/list", method = RequestMethod.GET)
 	@RequestMapping(value = "/pea-order/organization/list", method = RequestMethod.GET)
-	public Result<?> getAllOrganizations(@RequestParam("levelType") String levelType,
+	public Result<List<OrganizationDTO>> getAllOrganizations(@RequestParam("levelType") String levelType,
 			@RequestParam("organizationIds") List<String> organizationIds);
 			@RequestParam("organizationIds") List<String> organizationIds);
 
 
 }
 }

project-order/src/main/java/com/dituhui/pea/order/controller/PublicOrganizationController.java

@@ -9,6 +9,7 @@ import com.alibaba.druid.util.StringUtils;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.alibaba.nacos.client.naming.utils.CollectionUtils;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.BusinessException;
 import com.dituhui.pea.common.Result;
 import com.dituhui.pea.common.Result;
+import com.dituhui.pea.common.ResultEnum;
 import com.dituhui.pea.order.IOrganization;
 import com.dituhui.pea.order.IOrganization;
 import com.dituhui.pea.order.service.OrganizationService;
 import com.dituhui.pea.order.service.OrganizationService;
 import com.dituhui.pea.pojo.OrganizationDTO;
 import com.dituhui.pea.pojo.OrganizationDTO;
@@ -24,20 +25,20 @@ public class PublicOrganizationController implements IOrganization {
 	private OrganizationService organizationService;
 	private OrganizationService organizationService;
 
 
 	@Override
 	@Override
-	public Result<?> getAllOrganizations(String levelType, List<String> organizationIds) {
+	public Result<List<OrganizationDTO>> getAllOrganizations(String levelType, List<String> organizationIds) {
 		if (StringUtils.isEmpty(levelType)) {
 		if (StringUtils.isEmpty(levelType)) {
-			return Result.failed("缺少参数levelType");
+			return Result.instance(ResultEnum.COMMON_FAILED.getCode(), "缺少参数levelType", null);
 		}
 		}
 		if (CollectionUtils.isEmpty(organizationIds)) {
 		if (CollectionUtils.isEmpty(organizationIds)) {
-			return Result.failed("缺少参数organizationIds");
+			return Result.instance(ResultEnum.COMMON_FAILED.getCode(), "缺少参数organizationIds", null);
 		}
 		}
 
 
-		Result<?> res = null;
+		Result<List<OrganizationDTO>> res = null;
 		try {
 		try {
 			List<OrganizationDTO> orgs = organizationService.getAllOrganizations(levelType, organizationIds);
 			List<OrganizationDTO> orgs = organizationService.getAllOrganizations(levelType, organizationIds);
 			res = Result.success(orgs);
 			res = Result.success(orgs);
 		} catch (BusinessException e) {
 		} catch (BusinessException e) {
-			return Result.failed(e.getMessage());
+			return Result.instance(ResultEnum.COMMON_FAILED.getCode(), e.getMessage(), null);
 		}
 		}
 		return res;
 		return res;
 	}
 	}

project-user/src/main/java/com/dituhui/pea/user/service/UserService.java

@@ -151,10 +151,10 @@ public class UserService {
 					List<OrganizationDTO> allOrgs = resources.stream().filter(r -> r.getType() == 3).map(r -> {
 					List<OrganizationDTO> allOrgs = resources.stream().filter(r -> r.getType() == 3).map(r -> {
 						List<OrganizationDTO> orgs = Lists.newArrayList();
 						List<OrganizationDTO> orgs = Lists.newArrayList();
 						String[] temp = r.getExtra().split("\\|");
 						String[] temp = r.getExtra().split("\\|");
-						Result<?> result = organizationService.getAllOrganizations(temp[0],
+						Result<List<OrganizationDTO>> result = organizationService.getAllOrganizations(temp[0],
 								Arrays.asList(temp[1].split(",")));
 								Arrays.asList(temp[1].split(",")));
 						if (StringUtils.equals(ResultEnum.SUCCESS.getCode(), result.getCode())) {
 						if (StringUtils.equals(ResultEnum.SUCCESS.getCode(), result.getCode())) {
-							orgs = (List<OrganizationDTO>) result.getResult();
+							orgs = result.getResult();
 						}
 						}
 						return orgs;
 						return orgs;
 					}).flatMap(a -> a.stream()).collect(Collectors.toList());
 					}).flatMap(a -> a.stream()).collect(Collectors.toList());