修改bug

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

@@ -126,13 +126,13 @@ public class EquipmentCategoryController extends BaseController {
 	@TycloudOperation(ApiLevel = UserType.AGENCY)
 	@ApiOperation(httpMethod = "GET", value = "装备分类列表全部数据查询", notes = "装备分类列表全部数据查询")
 	@GetMapping(value = "/tree")
-	public ResponseModel<Object> tree(@RequestParam(value = "code",required = false) Long code) throws Exception {
+	public ResponseModel<Object> tree(@RequestParam(value = "code",required = false) String code) throws Exception {
 		if(ObjectUtils.isEmpty(code)){
 			return ResponseHelper.buildResponse(new ArrayList<>());
 		}
-		EquipmentCategory root = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, code.toString()));
+		EquipmentCategory root = equipmentCategoryServiceImpl.getOne(new LambdaQueryWrapper<EquipmentCategory>().eq(EquipmentCategory::getCode, code));
 		QueryWrapper<EquipmentCategory> queryWrapper = new QueryWrapper<>();
-		queryWrapper.likeRight("code", code.toString().replaceAll("0+$", ""));
+		queryWrapper.likeRight("code", code.replaceAll("0+$", ""));
 		Collection<EquipmentCategory> list = equipmentCategoryServiceImpl.list(queryWrapper);
 		Menu menu = new Menu(root.getId(), root.getName(), 0L, 0);
 		List<Menu> menus = TreeParser.getTree(root.getId(), list, EquipmentCategory.class.getName(), "getId", 0, "getName",

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

@@ -157,7 +157,7 @@ public class EquipmentCategoryServiceImpl extends BaseService<EquipmentCategoryD
             EquInfoDto equInfoDto = categoryOtherInfoMapper.selectEquipInfo(record);
             //判断这条数据认领状态是否为已认领(6035)，且是否已经有电梯96333码和监管码
             //如果都满足则直接返回不做生成码操作
-            if (ObjectUtils.isEmpty(equInfoDto) && "6035".equals(equInfoDto.getStatus()) && (ObjectUtils.isEmpty(equInfoDto.getSupervisor()) || ObjectUtils.isEmpty(equInfoDto.getCode()))) {
+            if (!ObjectUtils.isEmpty(equInfoDto) && "6035".equals(equInfoDto.getStatus()) && (ObjectUtils.isEmpty(equInfoDto.getSupervisor()) || ObjectUtils.isEmpty(equInfoDto.getCode()))) {
                 city = equInfoDto.getCity();
                 county = equInfoDto.getCounty();
                 equipCategory = equInfoDto.getEquipCategory();