电销人员信息不展示

src/main/java/com/ydtech/modules/admin/controller/SysPcAddressController.java

@@ -82,7 +82,7 @@ public class SysPcAddressController extends BaseController{
 
     @GetMapping("/queryRegionInfo/{type}")
     @ApiOperation(value = "区域人员概览")
-    public HttpResult<List<RegionInfoVo>> queryRegionInfo(@PathVariable("type") @ApiParam("全部：0   渠道：1 代理：2") Integer type) {
+    public HttpResult<List<RegionInfoVo>> queryRegionInfo(@PathVariable("type") @ApiParam("全部：null   渠道：1 代理：2") String type) {
         return HttpResult.ok("success", this.sysPcAddressService.queryRegionInfo(type));
     }
 

src/main/java/com/ydtech/modules/admin/controller/websocket/SysGeographyPositionController.java

@@ -53,7 +53,7 @@ public class SysGeographyPositionController {
 
     @GetMapping("/queryRegionInfo/{type}")
     @ApiOperation(value = "区域人员概览")
-    public HttpResult<List<RegionInfoVo>> queryRegionInfo(@PathVariable("type") @ApiParam("全部：0   渠道：1 代理：2")  Integer type) {
+    public HttpResult<List<RegionInfoVo>> queryRegionInfo(@PathVariable("type") @ApiParam("全部：null  渠道：1 代理：2")  String type) {
         return HttpResult.ok("success", this.sysGeographyPositionService.queryRegionInfo(type));
     }
 

src/main/java/com/ydtech/modules/admin/service/SysGeographyPositionService.java

@@ -20,5 +20,5 @@ public interface SysGeographyPositionService extends IService<SysGeographyPositi
 
     SysPcAddressNumVo queryPcNum();
 
-    List<RegionInfoVo> queryRegionInfo(Integer type);
+    List<RegionInfoVo> queryRegionInfo(String type);
 }

src/main/java/com/ydtech/modules/admin/service/SysPcAddressService.java

@@ -35,5 +35,5 @@ public interface SysPcAddressService extends IService<SysPcAddress> {
 
     SysPcAddressNumVo queryPcNum();
 
-    List<RegionInfoVo> queryRegionInfo(Integer type);
+    List<RegionInfoVo> queryRegionInfo(String type);
 }

src/main/java/com/ydtech/modules/admin/service/impl/SysGeographyPositionServiceImpl.java

@@ -14,6 +14,7 @@ import com.ydtech.modules.admin.model.SysUser;
 import com.ydtech.modules.admin.model.dto.SysGeographyPositionDto;
 import com.ydtech.modules.admin.model.dto.SysGeographyPositionPageDto;
 import com.ydtech.modules.admin.model.dto.SysPcAddressNumVo;
+import com.ydtech.modules.admin.model.po.SysPcAddress;
 import com.ydtech.modules.admin.model.vo.RegionInfoVo;
 import com.ydtech.modules.admin.model.vo.SysGeographyPositionInfoVo;
 import com.ydtech.modules.admin.model.vo.SysGeographyPositionVo;
@@ -113,11 +114,12 @@ public class SysGeographyPositionServiceImpl extends ServiceImpl<SysGeographyPos
     }
 
     @Override
-    public List<RegionInfoVo> queryRegionInfo(Integer type) {
+    public List<RegionInfoVo> queryRegionInfo(String type) {
         List<RegionInfoVo> regionInfoVos = new ArrayList<>();
-        //全部：0   渠道：1 代理：2
+        //全部：null  渠道：1 代理：2
         List<SysGeographyPosition> sysPcAddresses = sysGeographyPositionMapper.selectList(new LambdaQueryWrapper<SysGeographyPosition>()
-                .eq(type!=0,SysGeographyPosition::getSource, 1));
+                .in(SysGeographyPosition::getSource, Arrays.asList("1","2"))
+                .eq(StringUtils.isNotEmpty(type),SysGeographyPosition::getSource, type));
         Map<String, List<SysGeographyPosition>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysGeographyPosition::getDistrict));
 
         for (Map.Entry<String, List<SysGeographyPosition>> entry : map.entrySet()) {

src/main/java/com/ydtech/modules/admin/service/impl/SysPcAddressServiceImpl.java

@@ -111,11 +111,12 @@ public class SysPcAddressServiceImpl extends ServiceImpl<SysPcAddressMapper, Sys
     }
 
     @Override
-    public List<RegionInfoVo> queryRegionInfo(Integer type) {
+    public List<RegionInfoVo> queryRegionInfo(String type) {
         List<RegionInfoVo> regionInfoVos = new ArrayList<>();
-        //全部：0   渠道：1 代理：2
+        //全部：null   渠道：1 代理：2
         List<SysPcAddress> sysPcAddresses = sysPcAddressMapper.selectList(new LambdaQueryWrapper<SysPcAddress>()
-                .eq(type!=0,SysPcAddress::getSource, type));
+                .in(SysPcAddress::getSource, Arrays.asList("1","2"))
+                .eq(StringUtils.isNotEmpty(type),SysPcAddress::getSource, type));
         Map<String, List<SysPcAddress>> map = sysPcAddresses.stream().collect(Collectors.groupingBy(SysPcAddress::getDistrict));
 
         for (Map.Entry<String, List<SysPcAddress>> entry : map.entrySet()) {