Merge remote-tracking branch 'origin/master'

huimv-eartag2-admin/src/main/java/com/huimv/eartag2/admin/service/impl/BasePigpenServiceImpl.java

@@ -141,8 +141,8 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
     @Override
     public Result list(String farmCode, String pigpenName, String stageCode) {
         QueryWrapper<BasePigpen> queryWrapper = new QueryWrapper<>();
-        queryWrapper.like(StringUtils.isNotBlank(pigpenName),"pigpen_name", pigpenName);
-        queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
+//        queryWrapper.like(StringUtils.isNotBlank(pigpenName),"pigpen_name", pigpenName);
+//        queryWrapper.like(StringUtils.isNotBlank(stageCode),"stage_code", stageCode);
         queryWrapper.eq(StringUtils.isNotBlank(farmCode),"farm_code", farmCode);
         //创建排序
 //        queryWrapper.orderByAsc("sort");
@@ -151,6 +151,26 @@ public class BasePigpenServiceImpl extends ServiceImpl<BasePigpenMapper, BasePig
 
         //将结果List改为树
         List<TreeBasePigpen> treeBasePigpens = parseBizBaseArea(basePigpens);
+
+        //树型结构模糊查询父名称
+        for (int i = 0; i < treeBasePigpens.size(); i++){
+            TreeBasePigpen treeBasePigpen = treeBasePigpens.get(i);
+            String name = treeBasePigpen.getPigpenName();
+            Boolean flag = false;
+            for (int j = 0; j < name.length()-pigpenName.length()+1; j++){
+                String substring = name.substring(j, j + pigpenName.length());
+                if ((pigpenName.equals(substring))){
+                    flag = true;
+                    break;
+                }
+            }
+            System.out.println(flag);
+            if (!flag){
+                treeBasePigpens.remove(i);
+                i--;
+            }
+        }
+
         return new Result(ResultCode.SUCCESS,treeBasePigpens);
     }