“linengliang”
2023-10-08 c0d0d3b19d7c2181316582aceffa874d7fc4566d
lxzn-module-eam/src/main/java/org/jeecg/modules/eam/controller/EamEquipmentController.java
@@ -12,6 +12,7 @@
import org.apache.shiro.SecurityUtils;
import org.jeecg.common.api.dto.message.MessageDTO;
import org.jeecg.common.api.vo.Result;
import org.jeecg.common.aspect.annotation.PermissionData;
import org.jeecg.common.constant.CommonConstant;
import org.jeecg.common.system.api.ISysBaseAPI;
import org.jeecg.common.system.base.entity.SysUpload;
@@ -179,16 +180,16 @@
     * 设备保修  获取设备列表组件
     * qsw 2023-7-14
     */
    @GetMapping(value = "/getEquipmentList")
    @PermissionData
    public Result<IPage<Equipment>> getEquipmentList(Equipment equipment,
                                       @RequestParam(name="pageNo", defaultValue="1") Integer pageNo,
                                       @RequestParam(name="pageSize", defaultValue="10") Integer pageSize,
                                       HttpServletRequest req) {
       QueryWrapper<Equipment> queryWrapper = QueryGenerator.initQueryWrapper(equipment, req.getParameterMap());
//       queryWrapper.eq("status","1");
//       queryWrapper.eq("del_flag",0);
       Page<Equipment> page = new Page<Equipment>(pageNo, pageSize);
       IPage<Equipment> pageList = equipmentService.page(page, queryWrapper);
       IPage<Equipment> pageList = equipmentService.getEquipmentList(page, equipment);
       return Result.OK(pageList);
    }