Merge remote-tracking branch 'origin/develop_tzs_register' into develop_tzs_register

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/biz/controller/TzsAuthController.java

@@ -79,6 +79,17 @@ public class TzsAuthController extends BaseController {
     }
 
     /**
+     * 获取用户组织机构树
+     */
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
+    @GetMapping(value = "/getUserReginTree")
+    @ApiOperation(httpMethod = "GET", value = "获取用户组织机构树", notes = "获取用户组织机构树")
+    public ResponseModel<Collection<RegionModel>> getUserReginTree() {
+        List<RegionModel> result = tzsAuthService.getUserReginTree();
+        return ResponseHelper.buildResponse(result);
+    }
+
+    /**
      * 获取三级组织机构树
      *
      * @return

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderFillingRecordServiceImpl.java

@@ -337,6 +337,14 @@ public class CylinderFillingRecordServiceImpl extends BaseService<CylinderFillin
             boolMust.must(query);
         }
 
+        //应用id
+        if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getAppId())) {
+            flag = false;
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.termsQuery("appId",  esCylinderFillingRecordDto.getAppId().toLowerCase()));
+            boolMust.must(query);
+        }
+
         //匹配气瓶品种
         if (!ObjectUtils.isEmpty(esCylinderFillingRecordDto.getCylinderVariety())) {
             flag = false;

amos-boot-system-tzs/amos-boot-module-cylinder/amos-boot-module-cylinder-biz/src/main/java/com/yeejoin/amos/boot/module/cylinder/flc/biz/service/impl/CylinderInfoServiceImpl.java

@@ -908,14 +908,15 @@ public class CylinderInfoServiceImpl extends BaseService<CylinderInfoDto, Cylind
             boolMust.should(appIdBuilder);
         }
 
-        //匹配appid
+        //应用id
         if (!ObjectUtils.isEmpty(cylinderInfoDto.getAppId())) {
             flag = false;
-            BoolQueryBuilder appIdBuilder = QueryBuilders.boolQuery();
-            appIdBuilder.must(QueryBuilders.matchQuery("appId", "*" + cylinderInfoDto.getAppId() + "*"));
-            boolMust.should(appIdBuilder);
+            BoolQueryBuilder query = QueryBuilders.boolQuery();
+            query.must(QueryBuilders.termsQuery("appId",  cylinderInfoDto.getAppId().toLowerCase()));
+            boolMust.must(query);
         }
 
+
         //匹配产权单位
         if (!ObjectUtils.isEmpty(cylinderInfoDto.getUnitName())) {
             flag = false;