From 08f1b1f1804a8bd833d42f257908d80e88387b55 Mon Sep 17 00:00:00 2001
From: mitao <2763622819@qq.com>
Date: 星期五, 14 三月 2025 11:27:47 +0800
Subject: [PATCH] 3.5增加登录验证、修改密码、人员列表调整

---
 flower_city/src/main/java/com/dg/core/controller/OrganizationController.java |   99 +++++++++++++++++++++++++++++++++++++++++++++++--
 1 files changed, 94 insertions(+), 5 deletions(-)

diff --git a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
index 2b59286..44cdb75 100644
--- a/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
+++ b/flower_city/src/main/java/com/dg/core/controller/OrganizationController.java
@@ -9,6 +9,7 @@
 import com.dg.core.db.gen.entity.TransactionEvent;
 import com.dg.core.service.IOrganizationChartService;
 import com.dg.core.service.ITransactionEventService;
+import com.dg.core.util.PermissionUtil;
 import com.dg.core.util.TableDataInfo;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
@@ -41,7 +42,19 @@
     @GetMapping("/getList")
     public TableDataInfo selectConfigList()
     {
-        return getDataTable(iOrganizationChartService.selectConfigList("",""));
+        return getDataTable(iOrganizationChartService.selectConfigList("","",null));
+    }
+
+
+    /**
+     * 查询机构列表(权限)
+     */
+    @ApiOperation(value = "查询机构列表(权限 选择用 ) ",response = OrganizationChartEntity.class)
+    @GetMapping("/selectJurisdiction")
+    @Authorization
+    public TableDataInfo selectJurisdiction(@CurrentUser SysUser sysUser)
+    {
+        return getDataTable(iOrganizationChartService.selectConfigList(sysUser.getDepartmentId(),"",null));
     }
 
     /**
@@ -138,16 +151,45 @@
     @Authorization
     public TableDataInfo queryList(@RequestParam(value = "pageNum",required = false) Integer pageNum,
                                             @RequestParam(value = "pageSize",required = false) Integer pageSize,
-                                            @RequestParam(value = "organizationName",required = false)String organizationName){
+                                            @RequestParam(value = "organizationName",required = false)String organizationName,
+                                   @CurrentUser SysUser sysUser){
         Assert.notNull(pageNum, "pageNum can not be empty");
         Assert.notNull(pageSize, "pageSize can not be empty");
         Page<OrganizationChartEntity> pageParam = new Page<>(pageNum,pageSize);
-        return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName),iOrganizationChartService.countList(organizationName));
+        List<String> ids= PermissionUtil.getPermission(sysUser,iOrganizationChartService);
+        return getDataTable(iOrganizationChartService.queryList(pageParam,pageSize,organizationName,ids),
+                            iOrganizationChartService.countList(organizationName,ids));
     }
+
+
 
 
     /**
      * 通过父级id查询对应机构下的全部部门id
+     * @param departmentId
+     * @return
+     */
+    @ApiOperation(value = "通过父级id查询对应机构下的全部部门")
+    @GetMapping("/getdepartment/id")
+    public TableDataInfo getOrganizationIds(@RequestParam(value = "department",required = false) String departmentId)
+    {
+        if(StringUtils.isEmpty(departmentId))
+        {
+            return getDataTable("departmentId 不能为空");
+        }
+
+        List<String> ids=new ArrayList<>();
+        List<String> getId=iOrganizationChartService.getIds(departmentId);
+        ids.addAll(getId);
+        return getDataTable(ids);
+    }
+
+
+
+
+
+    /**
+     * 通过父级id查询对应机构下的全部部门
      * @param departmentId
      * @return
      */
@@ -156,7 +198,17 @@
     public TableDataInfo getOrganizations(@RequestParam(value = "department",required = false) String departmentId)
     {
         List<OrganizationChartEntity> ids=new ArrayList<>();
-        List<OrganizationChartEntity> lists = iOrganizationChartService.selectParentList(departmentId,"");
+        List<OrganizationChartEntity> lists=null;
+        if(StringUtils.isEmpty(departmentId))
+        {
+            lists= iOrganizationChartService.selectParentList(null,"1");
+
+        }
+        else
+        {
+            lists= iOrganizationChartService.selectParentList(departmentId,null);
+        }
+
         if(lists.size()<1)
         {
             lists.add(iOrganizationChartService.selectConfigById(departmentId));
@@ -166,7 +218,12 @@
         {
             return null;
         }
-        ids.add(iOrganizationChartService.selectConfigById(departmentId));
+
+        if(!StringUtils.isEmpty(departmentId))
+        {
+            ids.add(iOrganizationChartService.selectConfigById(departmentId));
+        }
+
         return getDataTable(ids);
     }
 
@@ -188,4 +245,36 @@
         return ids;
     }
 
+
+    /**
+     * 查询机构列表
+     */
+    @ApiOperation(value = "查询可切换机构列表",response = OrganizationChartEntity.class)
+    @GetMapping("switch/getList")
+    @Authorization
+    public TableDataInfo switchGetList(@CurrentUser SysUser sysUser)
+    {
+        List<String> ids=new ArrayList<>();
+        if(!StringUtils.isEmpty(sysUser.getMoreDepartmentIds()))
+        {
+            if(sysUser.getMoreDepartmentIds().indexOf(",")==-1)
+            {
+                ids.add(sysUser.getDepartmentId());
+            }
+            else
+            {
+                String[] list=sysUser.getMoreDepartmentIds().split(",");
+                for (String id:list)
+                {
+                    ids.add(id);
+                }
+            }
+        }
+        else
+        {
+            ids.add(sysUser.getDepartmentId());
+        }
+
+        return getDataTable(iOrganizationChartService.selectConfigList(ids));
+    }
 }

--
Gitblit v1.7.1