楚江ERP-客户开发权限code调整，和前端保持一致

@@ -78,7 +78,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
      * 查询列表
      * 查询列表
      */
      */
     @ApiOperation("查询列表")
     @ApiOperation("查询列表")
-    @HasPermission({"customer:develop:query"})
+    @HasPermission({"customer-dev-manage:customer-dev-plan:query"})
     @GetMapping("/query")
     @GetMapping("/query")
     public InvokeResult<PageResult<GetCustomerDevelopPlanBo>> query(@Valid QueryCustomerDevelopPlanVo vo) {
     public InvokeResult<PageResult<GetCustomerDevelopPlanBo>> query(@Valid QueryCustomerDevelopPlanVo vo) {
         PageResult<CustomerDevelopPlan> pageResult = customerDevelopPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
         PageResult<CustomerDevelopPlan> pageResult = customerDevelopPlanService.query(getPageIndex(vo), getPageSize(vo), vo);
@@ -95,7 +95,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
      */
      */
     @ApiOperation("根据ID查询")
     @ApiOperation("根据ID查询")
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
     @ApiImplicitParam(value = "id", name = "id", paramType = "query", required = true)
-    @HasPermission({"customer:develop:query"})
+    @HasPermission({"customer-dev-manage:customer-dev-plan:query"})
     @GetMapping
     @GetMapping
     public InvokeResult<GetCustomerDevelopPlanBo> get(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<GetCustomerDevelopPlanBo> get(@NotBlank(message = "id不能为空！") String id) {
         CustomerDevelopPlan data = customerDevelopPlanService.findById(id);
         CustomerDevelopPlan data = customerDevelopPlanService.findById(id);
@@ -111,7 +111,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
      * 新增
      * 新增
      */
      */
     @ApiOperation("新增")
     @ApiOperation("新增")
-    @HasPermission({"customer:develop:add"})
+    @HasPermission({"customer-dev-manage:customer-dev-plan:add"})
     @PostMapping
     @PostMapping
     public InvokeResult<Void> create(@Valid CreateCustomerDevelopPlanVo vo) {
     public InvokeResult<Void> create(@Valid CreateCustomerDevelopPlanVo vo) {
         customerDevelopPlanService.create(vo);
         customerDevelopPlanService.create(vo);
@@ -122,7 +122,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
      * 修改
      * 修改
      */
      */
     @ApiOperation("修改")
     @ApiOperation("修改")
-    @HasPermission({"customer:develop:modify"})
+    @HasPermission({"customer-dev-manage:customer-dev-plan:modify"})
     @PutMapping
     @PutMapping
     public InvokeResult<Void> update(@Valid UpdateCustomerDevelopPlanVo vo) {
     public InvokeResult<Void> update(@Valid UpdateCustomerDevelopPlanVo vo) {
         customerDevelopPlanService.update(vo);
         customerDevelopPlanService.update(vo);
@@ -146,7 +146,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
      *
      *
      */
      */
     @ApiOperation("取消")
     @ApiOperation("取消")
-    @HasPermission({"customer:develop:cancel"})
+    @HasPermission({"customer-dev-manage:customer-dev-plan:close"})
     @GetMapping("/cancel")
     @GetMapping("/cancel")
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
     public InvokeResult<Void> cancel(@NotBlank(message = "id不能为空！") String id) {
         customerDevelopPlanService.cancel(id);
         customerDevelopPlanService.cancel(id);
@@ -157,7 +157,7 @@ public class CustomerDevelopPlanController extends DefaultBaseController {
      * 导出
      * 导出
      */
      */
     @ApiOperation("导出")
     @ApiOperation("导出")
-    @HasPermission({"customer:develop:export"})
+    @HasPermission({"customer-dev-manage:customer-dev-plan:export"})
     @PostMapping("/export")
     @PostMapping("/export")
     public InvokeResult<Void> export(@Valid QueryCustomerDevelopPlanVo vo) {
     public InvokeResult<Void> export(@Valid QueryCustomerDevelopPlanVo vo) {
         ExportTaskUtil.exportTask("客户开发信息", CustomerDevelopExportTaskWorker.class, vo);
         ExportTaskUtil.exportTask("客户开发信息", CustomerDevelopExportTaskWorker.class, vo);

@@ -92,7 +92,7 @@ public class CustomerDevelopPlanServiceImpl extends BaseMpServiceImpl<CustomerDe
             // 获取当前人员的待办任务数据
             // 获取当前人员的待办任务数据
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             List<FlowTaskDto> flowTaskList = flowTaskWrapperMapper.queryTodoList(new QueryTodoTaskListVo(), SecurityUtil.getCurrentUser().getId());
             if (CollectionUtils.isEmpty(flowTaskList)) {
             if (CollectionUtils.isEmpty(flowTaskList)) {
-                return PageResultUtil.convert(new PageInfo<>());
+                return new PageResult<>();
             }
             }
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             List<String> ids = flowTaskList.stream().map(FlowTaskDto::getBusinessId).collect(Collectors.toList());
             vo.setIds(ids);
             vo.setIds(ids);