lidongdong
2022-10-24 0eb8d22f0e8d004b1e721cdd24b8e663bc80b6a2
flower_city/src/main/java/com/dg/core/controller/TransactionEventController.java
@@ -66,10 +66,10 @@
        Assert.notNull(pageNum, "pageNum 不能为空");
        Assert.notNull(pageSize, "pageSize 不能为空");
        Page<TransactionEvent> pageParam = new Page<>(pageNum,pageSize);
        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
//        List<String> ids=iOrganizationChartService.getIds(sysUser.getDepartmentId());
        List<TransactionEvent> list = iTransactionEventService.selectConfigList(pageParam,pageSize,keyword,
                classifyGrade,ids);
        int num=iTransactionEventService.countNum(keyword,classifyGrade,ids);
                classifyGrade,null);
        int num=iTransactionEventService.countNum(keyword,classifyGrade,null);
        return getDataTable(list,num);
    }
@@ -80,9 +80,9 @@
     */
    @ApiOperation(value = "导办事物列表(不分页)",response = TransactionEvent.class)
    @GetMapping("/selectList")
    public TableDataInfo selectList()
    public TableDataInfo selectList(@RequestParam(value = "keyWord",required = false) String keyWord)
    {
        return getDataTable(iTransactionEventService.selectList());
        return getDataTable(iTransactionEventService.selectList(keyWord));
    }
    /**
@@ -235,7 +235,6 @@
    @GetMapping("/smartConsulting")
    public RecommendResult smartConsulting(@RequestParam("keyWord") String keyWord){
        return  iTransactionEventService.smartConsulting(keyWord);
    }
@@ -257,6 +256,8 @@
        {
            return ResultData.error("复制项不存在");
        }
        transactionEvent.setMatterName(transactionEvent.getMatterName()+"(副本)");
        transactionEvent.setId(null);
        return toAjax(iTransactionEventService.insertConfig(transactionEvent));
    }