Skip to content

A
amos-boot-biz
Commit b1ee3b24 authored by tianbo's avatar tianbo
Browse files
Options

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

parents c378512a 6fc09932
Hide whitespace changes
Inline Side-by-side
Showing with 2 additions and 1 deletion
amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-biz/src/main/java/com/yeejoin/amos/boot/module/ymt/biz/controller/EquipmentCategoryController.java
View file @ b1ee3b24
......@@ -42,6 +42,7 @@ import org.springframework.web.bind.annotation.RequestMethod;
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;
import org.typroject.tyboot.core.foundation.enumeration.UserType;
import org.typroject.tyboot.core.foundation.utils.ValidationUtil;
import org.typroject.tyboot.core.restful.doc.TycloudOperation;
import org.typroject.tyboot.core.restful.utils.ResponseHelper;
import org.typroject.tyboot.core.restful.utils.ResponseModel;
......@@ -197,7 +198,7 @@ public class EquipmentCategoryController extends BaseController {
Collection<EquipmentCategory> list = equipmentCategoryServiceImpl.list(queryWrapper);
List<Menu> menus = TreeParser.getTree(root.getId(), list, EquipmentCategory.class.getName(), "getId", 0, "getName",
"getParentId", null, "getCode");
return ResponseHelper.buildResponse(menus.get(0));
return ResponseHelper.buildResponse(ValidationUtil.isEmpty(menus) ? null : menus.get(0));
}
/**
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment