From 0e8ca799128596dbe5c2c08964136d9b76636bdc Mon Sep 17 00:00:00 2001
From: furongxin <419481438@qq.com>
Date: Thu, 9 Jan 2025 10:10:16 +0800
Subject: [PATCH] =?UTF-8?q?refactor(system):=20=E4=BC=98=E5=8C=96=E9=83=A8?=
 =?UTF-8?q?=E9=97=A8=E4=BF=A1=E6=81=AF=E8=8E=B7=E5=8F=96=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- 修改了 DeptService 接口，增加了 method 参数以
---
 .../yudao/module/system/api/dept/DeptApiImpl.java      |  2 +-
 .../system/controller/admin/dept/DeptController.java   |  5 +++--
 .../punchrecord/AttendancePunchRecordController.java   |  2 +-
 .../admin/worklog/LogInstanceController.java           |  2 +-
 .../yudao/module/system/service/dept/DeptService.java  |  2 +-
 .../module/system/service/dept/DeptServiceImpl.java    | 10 ++++++----
 6 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
index d72b407f..f147139e 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/api/dept/DeptApiImpl.java
@@ -132,7 +132,7 @@ public class DeptApiImpl implements DeptApi {
     @Override
     @DataPermission(enable = false)
     public CommonResult<List<DeptRespDTO>> getCompanyDept() {
-        List<DeptDO> deptDOS = deptService.getCompanyDept();
+        List<DeptDO> deptDOS = deptService.getCompanyDept(2);
         return success(BeanUtils.toBean(deptDOS, DeptRespDTO.class));
     }
 
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
index 2c542e1c..e8be097f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/dept/DeptController.java
@@ -271,9 +271,10 @@ public class DeptController {
 
     @GetMapping("/getCompanyDept")
     @Operation(summary = "获取部门类型为公司的部门信息")
+    @Parameter(name = "method", description = "查询类型 | 1全部 2真实公司 3隐藏公司")
     @DataPermission(enable = false)
-    public CommonResult<List<DeptSimpleRespVO>> getCompanyDept() {
-        List<DeptDO> list = deptService.getCompanyDept();
+    public CommonResult<List<DeptSimpleRespVO>> getCompanyDept(@RequestParam(name = "method", required = false, defaultValue = "2") Integer method) {
+        List<DeptDO> list = deptService.getCompanyDept(method);
 
         return success(BeanUtils.toBean(list, DeptSimpleRespVO.class));
     }
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java
index 7347835c..537f72b4 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/punchrecord/AttendancePunchRecordController.java
@@ -75,7 +75,7 @@ public class AttendancePunchRecordController {
 
     @GetMapping("/getMissingCardRecord")
     @Operation(summary = "获得本月用户缺卡记录")
-    @PreAuthorize("@ss.hasPermission('attendance:punch-record:query')")
+//    @PreAuthorize("@ss.hasPermission('attendance:punch-record:query')")
     public CommonResult<List<AttendancePunchRecordRespVO>> getPunchRecord() {
 
         // 获取当前用户已申请的补卡记录
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
index 442ea62f..7fb6816f 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/controller/admin/worklog/LogInstanceController.java
@@ -178,7 +178,7 @@ public class LogInstanceController {
     public CommonResult<List<DeptRespVO>> getReadCompanyDept() {
 
         // 获得公司编号列表
-        List<DeptDO> companyDeptDOs = deptService.getCompanyDept();
+        List<DeptDO> companyDeptDOs = deptService.getCompanyDept(2);
 
         // 获得用户角色
         List<RoleDO> userRoles = roleService.getRoleListFromCache(permissionService.getUserRoleIdListByUserId(getLoginUserId()));
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
index 6a612c1b..53bd84dd 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptService.java
@@ -138,7 +138,7 @@ public interface DeptService {
      *
      * @return 部门信息列表
      */
-    List<DeptDO> getCompanyDept();
+    List<DeptDO> getCompanyDept(Integer method);
 
     /**
      * 获取所有工厂部门
diff --git a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
index cd3c7944..5784c05a 100644
--- a/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
+++ b/yudao-module-system/yudao-module-system-biz/src/main/java/cn/iocoder/yudao/module/system/service/dept/DeptServiceImpl.java
@@ -330,14 +330,16 @@ public class DeptServiceImpl implements DeptService {
 
     @Override
     @DataPermission(enable = false)
-    public List<DeptDO> getCompanyDept() {
+    public List<DeptDO> getCompanyDept(Integer method) {
 
         return deptMapper.selectList(new LambdaQueryWrapperX<DeptDO>()
+                .eq(method == 2, DeptDO::getVirtuallyStatus, 0)
+                .eq(method == 3, DeptDO::getVirtuallyStatus, 1)
+                .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus())
                 .eq(DeptDO::getType, DeptTypeEnum.COMPANY.getValue())
                 .or()
-                .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue())
-                .eq(DeptDO::getVirtuallyStatus, 0)
-                .eq(DeptDO::getStatus, CommonStatusEnum.ENABLE.getStatus()));
+                .eq(DeptDO::getType, DeptTypeEnum.HEAD_COMPANY.getValue()));
+
     }
 
     @Override