fix
This commit is contained in:
parent
9d6bed3d9c
commit
8bef3e34bc
|
|
@ -11,4 +11,5 @@ public class DevInfoVo extends DevInfo {
|
|||
private long parentId;
|
||||
private String typeName;
|
||||
private String companyName;
|
||||
private String keyWord;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -33,7 +33,7 @@ public class DevInfoController extends BaseController
|
|||
* 查询设备信息列表
|
||||
*/
|
||||
@RequiresPermissions("equip:info:list")
|
||||
@GetMapping("/list")
|
||||
@PostMapping("/list")
|
||||
public TableDataInfo list(DevInfoVo devInfo)
|
||||
{
|
||||
startPage();
|
||||
|
|
|
|||
|
|
@ -63,6 +63,16 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
|
|||
<if test="creator != null "> and d.creator = #{creator}</if>
|
||||
<if test="deposit != null "> and d.deposit = #{deposit}</if>
|
||||
<if test="isActive != null and isActive != ''"> and d.is_active = #{isActive}</if>
|
||||
<if test="keyWord != null and keyWord != ''">
|
||||
and (
|
||||
locate(#{typeName},t.type_name) > 0
|
||||
or locate(#{companyName},c.company_name) > 0
|
||||
or locate(#{maId},d.ma_id) > 0
|
||||
or locate(#{modelName},d.model_name) > 0
|
||||
or locate(#{serialNumber},d.serial_number) > 0
|
||||
or locate(#{description},d.description) > 0
|
||||
)
|
||||
</if>
|
||||
</where>
|
||||
</select>
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue