From 571f8620b944f49903d30a5ee358f4d883a3dd54 Mon Sep 17 00:00:00 2001 From: furongxin <419481438@qq.com> Date: Sun, 5 Jan 2025 10:56:45 +0800 Subject: [PATCH] =?UTF-8?q?feat(system):=20=E5=A2=9E=E5=8A=A0=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E7=8A=B6=E6=80=81=E6=8E=A5=E5=8F=A3=E5=B9=B6=E8=B0=83?= =?UTF-8?q?=E6=95=B4=E9=83=A8=E9=97=A8=E7=9B=B8=E5=85=B3=E5=8A=9F=E8=83=BD?= =?UTF-8?q?-=20=E5=9C=A8=20UserController=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=20?= =?UTF-8?q?getUserStatus=E6=8E=A5=E5=8F=A3=EF=BC=8C=E7=94=A8=E4=BA=8E?= =?UTF-8?q?=E8=8E=B7=E5=8F=96=E5=BD=93=E5=89=8D=E7=99=BB=E5=BD=95=E7=94=A8?= =?UTF-8?q?=E6=88=B7=E6=98=AF=E5=90=A6=E5=B1=9E=E4=BA=8E=E5=B7=A5=E5=8E=82?= =?UTF-8?q?=E4=BA=BA=E5=91=98=20-=20=E6=9B=B4=E6=96=B0=20FactoryInfoServic?= =?UTF-8?q?eImpl=20=E4=B8=AD=E5=88=9B=E5=BB=BA=E9=83=A8=E9=97=A8=E7=9A=84?= =?UTF-8?q?=E9=80=BB=E8=BE=91=EF=BC=8C=E8=AE=BE=E7=BD=AE=E8=99=9A=E6=8B=9F?= =?UTF-8?q?=E7=8A=B6=E6=80=81=E4=B8=BA=200=20-=20=E5=9C=A8=20DeptTypeEnum?= =?UTF-8?q?=20=E4=B8=AD=E6=B7=BB=E5=8A=A0=20HEAD=5FCOMPANY=20=E7=B1=BB?= =?UTF-8?q?=E5=9E=8B=20-=20=E5=9C=A8=20ErrorCodeConstants=20=E4=B8=AD?= =?UTF-8?q?=E6=B7=BB=E5=8A=A0=20OA=5FPAYMENT=5FFILES=5FNOT=5FNULL=20?= =?UTF-8?q?=E9=94=99=E8=AF=AF=E7=A0=81?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../framework/common/enums/DeptTypeEnum.java | 1 + .../module/bpm/enums/ErrorCodeConstants.java | 1 + .../controller/admin/user/UserController.java | 19 +++++++++++++++++++ .../factoryinfo/FactoryInfoServiceImpl.java | 3 ++- 4 files changed, 23 insertions(+), 1 deletion(-) diff --git a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DeptTypeEnum.java b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DeptTypeEnum.java index 753944f3..66abddc8 100644 --- a/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DeptTypeEnum.java +++ b/yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DeptTypeEnum.java @@ -10,6 +10,7 @@ import lombok.Getter; @Getter public enum DeptTypeEnum { + HEAD_COMPANY("HEAD_COMPANY", "总公司"), COMPANY("COMPANY", "公司"), SALE_DEPT("SALE_DEPT", "销售部门"), DEVELOPMENT_DEPT("DEVELOPMENT_DEPT", "开发部门"), diff --git a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java index 122939d2..0afec317 100644 --- a/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java +++ b/yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java @@ -62,6 +62,7 @@ public interface ErrorCodeConstants { ErrorCode OA_CONTRACT_INVOICE_AMOUNT_LACK = new ErrorCode(1_009_001_125, "该合同的开票余额不足！"); ErrorCode OA_PAYMENT_NOT_EXISTS = new ErrorCode(1_009_001_126, "付款申请不存在"); ErrorCode OA_RECEIPT_NOT_EXISTS = new ErrorCode(1_009_001_127, "回款申请不存在"); + ErrorCode OA_PAYMENT_FILES_NOT_NULL = new ErrorCode(1_009_001_128, "后补发票不能为空！"); // ========== 流程模型 1-009-002-000 ========== ErrorCode MODEL_KEY_EXISTS = new ErrorCode(1_009_002_000, "已经存在流程标识为【{}】的流程"); 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 cdf6a95d..16cbea78 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 @@ -40,10 +40,12 @@ import java.time.format.DateTimeFormatter; import java.util.*; import java.util.stream.Collectors; +import static cn.iocoder.yudao.framework.common.pojo.CommonResult.error; import static cn.iocoder.yudao.framework.common.pojo.CommonResult.success; import static cn.iocoder.yudao.framework.common.util.collection.CollectionUtils.*; import static cn.iocoder.yudao.framework.operatelog.core.enums.OperateTypeEnum.EXPORT; import static cn.iocoder.yudao.framework.security.core.util.SecurityFrameworkUtils.getLoginUserId; +import static cn.iocoder.yudao.module.bpm.enums.ErrorCodeConstants.TASK_OPERATE_FAIL_USER_NO_DEPT; @Tag(name = "管理后台 - 用户") @RestController @@ -332,6 +334,23 @@ public class UserController { return success(pageResult); } + @GetMapping("/getUserStatus") + @Operation(summary = "获得当前登录用户是否属于工厂人员") + @PreAuthorize("@ss.hasPermission('system:user:query')") + public CommonResult getUserStatus() { + + DeptDO deptDO = deptService.getDept(userService.getUser(getLoginUserId()).getDeptId()); + if (deptDO == null) { + return error(TASK_OPERATE_FAIL_USER_NO_DEPT); + } + + if (deptDO.getFactoryId() == null) { + return success(false); + }else { + return success(true); + } + } + @GetMapping("/export") @Operation(summary = "导出用户") @PreAuthorize("@ss.hasPermission('system:user:export')") diff --git a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java index f7a92819..c733d0ec 100644 --- a/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java +++ b/zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java @@ -68,9 +68,10 @@ public class FactoryInfoServiceImpl implements FactoryInfoService { DeptRespDTO deptRespDTO = new DeptRespDTO(); deptRespDTO.setFactoryId(factoryInfo.getId()); deptRespDTO.setName(createReqVO.getShortName()); - deptRespDTO.setParentId(130L); //这里设置上级部门为 生产部 + deptRespDTO.setParentId(169L); //这里设置上级部门为 生产部 deptRespDTO.setLeaderUserId(createReqVO.getLeaderUserId()); deptRespDTO.setStatus(CommonStatusEnum.ENABLE.getStatus()); + deptRespDTO.setVirtuallyStatus(0); deptApi.createDept(deptRespDTO); }