fix(weapp): 接口修改

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/controller/TzsAppController.java

@@ -34,14 +34,7 @@ import io.swagger.annotations.ApiOperation;
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.util.ObjectUtils;
-import org.springframework.web.bind.annotation.GetMapping;
-import org.springframework.web.bind.annotation.PathVariable;
-import org.springframework.web.bind.annotation.PostMapping;
-import org.springframework.web.bind.annotation.RequestBody;
-import org.springframework.web.bind.annotation.RequestMapping;
-import org.springframework.web.bind.annotation.RequestMethod;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.bind.annotation.RestController;
+import org.springframework.web.bind.annotation.*;
 import org.typroject.tyboot.core.foundation.context.RequestContext;
 import org.typroject.tyboot.core.foundation.enumeration.UserType;
 import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
@@ -102,14 +95,14 @@ public class TzsAppController {
         //判断是否有权限查看全部信息
         if (LEVEL.equals(companys.getLevel())) {
             //企业
-            if (detial.get("USE_UNIT_CREDIT_CODE").equals(companys.getCompanyCode())) {
+            if (!ValidationUtil.isEmpty(detial.get("USE_UNIT_CREDIT_CODE")) && detial.get("USE_UNIT_CREDIT_CODE").equals(companys.getCompanyCode())) {
                 equipmentInfo = appService.getEquipmentInfo(record);
             } else {
                 equipmentInfo = appService.getEquipmentInfoWX(record);
             }
         } else {
             //监管
-            if (detial.get("ORG_BRANCH_CODE").contains(companys.getOrgCode())) {
+            if (!ValidationUtil.isEmpty(detial.get("ORG_BRANCH_CODE")) && detial.get("ORG_BRANCH_CODE").contains(companys.getOrgCode())) {
                 equipmentInfo = appService.getEquipmentInfo(record);
             } else {
                 equipmentInfo = appService.getEquipmentInfoWX(record);

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/EquipmentCategoryServiceImpl.java

@@ -1211,6 +1211,12 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             meBuilder.must(QueryBuilders.matchPhraseQuery("STATUS", test));
             boolMust.must(meBuilder);
         }
+        if (!ObjectUtils.isEmpty(map.getString("IS_INTO_MANAGEMENT"))) {
+            BoolQueryBuilder pBuilder = QueryBuilders.boolQuery();
+            String param = QueryParser.escape(map.getString("IS_INTO_MANAGEMENT"));
+            pBuilder.must(QueryBuilders.matchQuery("IS_INTO_MANAGEMENT", param));
+            boolMust.must(pBuilder);
+        }
         builder.query(boolMust);
         builder.sort("REC_DATE", SortOrder.DESC);
         builder.from((map.getInteger("number") - 1) * map.getInteger("size"));

amos-boot-system-tzs/amos-boot-module-app/amos-boot-module-app-biz/src/main/java/com/yeejoin/amos/boot/module/app/biz/service/impl/TzsAppService.java

@@ -794,7 +794,7 @@ public class TzsAppService {
 	// 处理字典值
 	public void getCon(String fileName, JSONObject jsonObject, Map<String, Object> map,
 	                   List<DataDictionary> dictionaryList, List<EquipmentCategory> equipmentCategories) {
-		if ("province".contains(fileName) || "city".contains(fileName) || "county".contains(fileName)) {
+		if ("city".contains(fileName) || "county".contains(fileName)) {
 			JSONArray regionName = getRegionName();
 			List<RegionModel> list = JSONArray.parseArray(regionName.toJSONString(), RegionModel.class);
 			if (!ValidationUtil.isEmpty(list) && !ValidationUtil.isEmpty(jsonObject.getString(fileName))) {