diff --git a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java index b28b7447..12922c3d 100644 --- a/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java +++ b/sgzb-api/sgzb-api-system/src/main/java/com/bonus/sgzb/base/api/domain/MaType.java @@ -141,7 +141,7 @@ public class MaType extends BaseEntity { /** 图片路径 */ @ApiModelProperty(value = "图片路径") - private String photoUrl = "https://zlpt-1259760603.cos.ap-nanjing.myqcloud.com/zhcc/405D4B1F-0942-424e-B45A-C66FDDA74EEA.png"; + private String photoUrl; /** 文档名称 */ @ApiModelProperty(value = "文档名称") diff --git a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java index 3db2f38a..883f9581 100644 --- a/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java +++ b/sgzb-modules/sgzb-base/src/main/java/com/bonus/sgzb/base/controller/MaTypeController.java @@ -103,7 +103,8 @@ public class MaTypeController extends BaseController { if (level == 2) { // 查询二级 if (parentId == 0){ - return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(null,keyword)); + List maTypes = maTypeMapper.selectMaTypeListByLevelNotFour(null, keyword); + return AjaxResult.success(maTypes); }else { return AjaxResult.success(maTypeMapper.selectMaTypeListByLevelNotFour(parentId.toString(),keyword)); } diff --git a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml index 233b8059..74513653 100644 --- a/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml +++ b/sgzb-modules/sgzb-base/src/main/resources/mapper/base/MaMachineTypeMapper.xml @@ -361,8 +361,9 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" select m.type_id, m.type_name, m.parent_id, m.status, m.num, m.unit_id, m.manage_type, m.lease_price, m.eff_time, m.rent_price, m.buy_price, m.pay_price, m.level, m.rated_load, m.test_load, m.holding_time, m.warn_num, m.del_flag, m.create_by, m.create_time, - m.remark, m.company_id + m.remark, m.company_id,mtf.file_url photoUrl from ma_type m + left join (select * from ma_type_file where file_type = '1') mtf on m.type_id = mtf.type_id m.level != 4