From ac437a314cc4cf33b069d04285b267f6bb0b102c Mon Sep 17 00:00:00 2001 From: Echo <4759156@qq.com> Date: Thu, 10 Jul 2025 16:41:09 +0800 Subject: [PATCH] =?UTF-8?q?=E6=A0=B9=E6=8D=AE=E5=85=AC=E5=8F=B8ID=EF=BC=8C?= =?UTF-8?q?=E6=9F=A5=E8=AF=A2=E8=AF=A5=E5=85=AC=E5=8F=B8=E4=B8=8B=E7=9A=84?= =?UTF-8?q?=E6=89=80=E6=9C=89=E7=94=A8=E6=88=B7=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../admin/oa/BpmOAExpensesController.java | 13 +++++++++++-- .../controller/admin/loan/LoanController.java | 12 +++++++++++- .../controller/admin/user/UserController.java | 6 +++++- 3 files changed, 27 insertions(+), 4 deletions(-) diff --git a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java index a507b973..aff980e6 100644 --- a/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java +++ b/yudao-module-bpm/yudao-module-bpm-biz/src/main/java/cn/iocoder/yudao/module/bpm/controller/admin/oa/BpmOAExpensesController.java @@ -65,7 +65,16 @@ public class BpmOAExpensesController { @Operation(summary = "获得生产开支申请分页") @DataPermission(enable = false) public CommonResult> getExpensesPage(BpmOAExpensesPageReqVO pageReqVO) { - + Long companyId = pageReqVO.getFactoryId() ; + //1 = 113 中鼐智能科技（江西）有限公司, 10000083 = 136 世瑞华科技(深圳)有限公司 10000061 = 166 中鼐智能科技(江西)有限公司(高安) + if(companyId == 1L) { + companyId = 113L; + }else if(companyId == 10000083L) { + companyId = 136L; + }else if(companyId == 10000061L ){ + companyId = 166L ; + } + pageReqVO.setFactoryId(companyId) ; PageResult respVO = expensesService.getExpensesPage(pageReqVO); return success(respVO); } @@ -107,4 +116,4 @@ public class BpmOAExpensesController { expensesService.oneClickPayment(month); return success(true); } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java index 2e608ec5..d740ce3d 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/loan/LoanController.java @@ -68,6 +68,16 @@ public class LoanController { @Operation(summary = "获得借支管理分页") @PreAuthorize("@ss.hasPermission('system:loan:query')") public CommonResult> getLoanPage(@Valid LoanPageReqVO pageReqVO) { + Long companyId = pageReqVO.getDeptId() ; + //1 = 113 中鼐智能科技（江西）有限公司, 10000083 = 136 世瑞华科技(深圳)有限公司 10000061 = 166 中鼐智能科技(江西)有限公司(高安) + if(companyId == 1L) { + companyId = 113L; + }else if(companyId == 10000083L) { + companyId = 136L; + }else if(companyId == 10000061L ){ + companyId = 166L ; + } + pageReqVO.setDeptId(companyId) ; PageResult pageResult = loanService.getLoanPage(pageReqVO); PageResult result = BeanUtils.toBean(pageResult, LoanRespVO.class); @@ -91,4 +101,4 @@ public class LoanController { return success(result); } -} \ No newline at end of file +} diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java index 10c0cc54..b5de8e88 100644 --- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java +++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java @@ -3,6 +3,7 @@ package cn.iocoder.yudao.module.system.controller.admin.user; import cn.hutool.core.collection.CollUtil; import cn.hutool.core.util.StrUtil; import cn.iocoder.yudao.framework.common.enums.CommonStatusEnum; +import cn.iocoder.yudao.framework.common.exception.ServiceException; import cn.iocoder.yudao.framework.common.pojo.CommonResult; import cn.iocoder.yudao.framework.common.pojo.PageParam; import cn.iocoder.yudao.framework.common.pojo.PageResult; @@ -482,10 +483,13 @@ public class UserController { companyId = 113L; }else if(companyId == 10000083L) { companyId = 136L; - }else { + }else if(companyId == 10000061L ){ companyId = 166L ; } List deptDOS = deptService.getChildDept(companyId); + if(deptDOS == null){ + throw new ServiceException(500, "公司ID，未查询到数据"); + } List userDOS = userService.getUserListByDeptIds(convertList(deptDOS, DeptDO::getId), CommonStatusEnum.ENABLE.getStatus()); return success(BeanUtils.toBean(userDOS, UserSimpleRespVO.class)); }