ak/zn-cloud
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat(system): 增加用户状态接口并调整部门相关功能- 在 UserController 中添加 getUserStatus接口，用于获取当前登录用户是否属于工厂人员

Browse Source 
- 更新 FactoryInfoServiceImpl 中创建部门的逻辑，设置虚拟状态为 0
- 在 DeptTypeEnum 中添加 HEAD_COMPANY 类型
- 在 ErrorCodeConstants 中添加 OA_PAYMENT_FILES_NOT_NULL 错误码
This commit is contained in:
furongxin 2025-01-05 10:56:45 +08:00
parent 23d3c78eda
commit 571f8620b9
4 changed files with 23 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
yudao-framework/yudao-common/src/main/java/cn/iocoder/yudao/framework/common/enums/DeptTypeEnum.java
View File

@ -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", "开发部门"),

1
yudao-module-bpm/yudao-module-bpm-api/src/main/java/cn/iocoder/yudao/module/bpm/enums/ErrorCodeConstants.java
View File

@ -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, "已经存在流程标识为【{}】的流程");

19
yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/user/UserController.java
View File

@ -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<Boolean> 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')")

3
zn-module-smartfactory/zn-module-smartfactory-biz/src/main/java/cn/iocoder/yudao/module/smartfactory/service/factoryinfo/FactoryInfoServiceImpl.java
View File

@ -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);
}