'修复地区查询无数据问题'

hai-cweb/src/main/java/com/cweb/controller/HighCouponController.java

@@ -77,9 +77,9 @@ public class HighCouponController {
                                       @RequestParam(name = "pageSize", required = true) Integer pageSize) {
         try {
 
-            SecRegion region = commonService.getRegionsById(Long.parseLong(regionId));
+            SecRegion region = commonService.getParentByRegion(Long.parseLong(regionId));
-            if (region != null && region.getParentId() != null) {
+            if (region != null) {
-                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getParentId().toString());
+                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
                 if (bsCompany != null) {
                     Map<String, Object> map = new HashMap<>();
                     map.put("companyId", bsCompany.getId());

hai-cweb/src/main/java/com/cweb/controller/HighMerchantStoreController.java

@@ -137,9 +137,9 @@ public class HighMerchantStoreController {
     @ApiOperation(value = "查询商户列表")
     public ResponseData getMerchantList(@RequestParam(name = "regionId", required = true) String regionId) {
         try {
-            SecRegion region = commonService.getRegionsById(Long.parseLong(regionId));
+            SecRegion region = commonService.getParentByRegion(Long.parseLong(regionId));
-            if (region != null && region.getParentId() != null) {
+            if (region != null) {
-                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getParentId().toString());
+                BsCompany bsCompany = bsCompanyService.selectCompanyByRegion(region.getRegionId().toString());
                 Map<String, Object> map = new HashMap<>();
                 map.put("companyId", bsCompany.getId());
                 map.put("status", 1);

hai-service/src/main/java/com/hai/service/CommonService.java

@@ -161,5 +161,5 @@ public interface CommonService {
      */
     List<SecRegion> findByName(String name);
 
-
+    SecRegion getParentByRegion(Long regionId);
 }

hai-service/src/main/java/com/hai/service/impl/CommonServiceImpl.java

@@ -391,4 +391,18 @@ public class CommonServiceImpl implements CommonService {
 		example.createCriteria().andStatusEqualTo(1).andRegionNameEqualTo(name);
 		return regionMapper.selectByExample(example);
 	}
+
+	@Override
+	public SecRegion getParentByRegion(Long regionId) {
+		SecRegion secRegion = getRegionsById(regionId);
+		if (secRegion != null && secRegion.getParentId() != null) {
+			while (true) {
+				secRegion = getRegionsById(secRegion.getParentId());
+				if (secRegion.getParentId() == null) {
+					return secRegion;
+				}
+			}
+		}
+		return secRegion;
+	}
 }