liujie
2023-10-15 1707d15796d7dc78812f19b9c34868c8cb38a714
src/main/java/com/stylefeng/guns/modular/system/controller/TCarriersController.java
@@ -64,14 +64,16 @@
            @ApiImplicitParam(name = "name", value = "powerUnitNumber", required = false, dataType = "String",paramType = "query"),
            @ApiImplicitParam(name = "pageNumber", value = "pageNumber", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "pageSize", value = "pageSize", required = true, dataType = "int",paramType = "query"),
            @ApiImplicitParam(name = "companyId", value = "companyId", required = true, dataType = "int",paramType = "query"),
    })
    @GetMapping(value = "/list")
    @ResponseBody
        public Object list(String time,String name,int pageNumber,int pageSize) {
        public Object list(String time,String name,int pageNumber,int pageSize,int companyId) {
        Page<TCarriers> tCarriersPage = new Page<>(pageNumber, pageSize);
        String sTime=null;
        String eTime=null;
        EntityWrapper<TCarriers> wrapper = new EntityWrapper<>();
        wrapper.eq("company_id",companyId);
        wrapper.eq("remove",0);
        if(ToolUtil.isNotEmpty(name)){
            wrapper.like("company_name",name).or().like("account",name);