根据行政编码查牧场

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/java/com/huimv/manager/service/impl/CollectorRegisterServiceImpl.java

@@ -54,10 +54,10 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
         String networkStatus = (String)params.get("networkStatus");
 
         wrapper.like(StringUtils.isNotBlank(deviceCode),"register.device_code",deviceCode);
-        wrapper.like(StringUtils.isNotBlank(countyName),"county_name",countyName).or().like("county_code",countyName);
-        wrapper.like(StringUtils.isNotBlank(farmName),"farm_name",farmName).or().like("farm_code",farmName);
+        wrapper.like(StringUtils.isNotBlank(countyName),"register.county_name",countyName).or().like(StringUtils.isNotBlank(countyName),"register.county_code",countyName);
+        wrapper.like(StringUtils.isNotBlank(farmName),"register.farm_name",farmName).or().like(StringUtils.isNotBlank(farmName),"register.farm_code",farmName);
 
-        wrapper.eq(StringUtils.isNotBlank(farmCode),"register.farm_code",farmCode);
+//        wrapper.eq(StringUtils.isNotBlank(farmCode),"register.farm_code",farmCode);
         if (StringUtils.isNotBlank(acqStatus)){
             wrapper.eq("acq_status",Integer.parseInt(acqStatus));
         }
@@ -79,12 +79,11 @@ public class CollectorRegisterServiceImpl extends ServiceImpl<CollectorRegisterD
             wrapper.ge("register.register_time",registerStartTime);
         }
 
-//        wrapper.ge(StringUtils.isNotBlank(registerEndTime),"register.register_time",registerStartTime);
 
-        wrapper.apply("register.del_status  = 1");
+//        wrapper.apply("register.del_status  = 1");
 
         String sortord = (String)params.get("sortord");
-        wrapper.orderByDesc(sortord);
+        wrapper.orderByDesc(StringUtils.isNotBlank(sortord),sortord);
         IPage<CollectorRegisterVo> page = baseMapper.page(new Query<>().getPage(params),wrapper);
 
         return new PageUtils(page);

smart.eartag.data.platform/huimv-smart-eartag-data-manager/src/main/resources/mapper/manager/CollectorRegisterDao.xml

@@ -50,7 +50,8 @@
         from collector_register register
         join base_pigpen pigpen on pigpen.id = register.pigpen_id
         join base_pigpen unit on unit.id = register.unit_id
-      ${ew.customSqlSegment}
+
+      ${ew.customSqlSegment} and  register.del_status  = 1
     </select>