From 89ab027aab977c162da27e02125699682c90af5c Mon Sep 17 00:00:00 2001
From: liao <liao@syxysoft.com>
Date: Thu, 26 Oct 2023 18:31:21 +0800
Subject: [PATCH] =?UTF-8?q?update=20=E8=B5=84=E6=96=99=E4=B8=AD=E5=BF=83-?=
 =?UTF-8?q?=E6=96=87=E4=BB=B6=E5=A4=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../jero/modules/laws/common/util/CurrentUserUtil.java | 10 ++++++++++
 .../mapper/xml/LawsDataCenterFolderMapper.xml          |  3 ++-
 .../service/impl/LawsDataCenterFileServiceImpl.java    |  1 +
 .../service/impl/LawsDataCenterFolderServiceImpl.java  |  5 +++++
 4 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/laws-modules/src/main/java/com/jero/modules/laws/common/util/CurrentUserUtil.java b/laws-modules/src/main/java/com/jero/modules/laws/common/util/CurrentUserUtil.java
index 3b99d087..49e60731 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/common/util/CurrentUserUtil.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/common/util/CurrentUserUtil.java
@@ -30,4 +30,14 @@ public class CurrentUserUtil {
         return loginUser.getUsername();
     }
 
+    /**
+     * @Author: liao
+     * @Date: 2023/10/26 18:26
+     * @Description: 获取当前用户部门
+     **/
+    public static String getOrgCode() {
+        LoginUser loginUser = (LoginUser) SecurityUtils.getSubject().getPrincipal();
+        return loginUser.getOrgCode();
+    }
+
 }
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml
index aeb88049..8fe280b5 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/mapper/xml/LawsDataCenterFolderMapper.xml
@@ -22,7 +22,8 @@
             ldcf.folder_name,
             ldcf.auth_manage_ids,
             ldcf.auth_view_ids,
-            ldcf.parent_id
+            ldcf.parent_id,
+            ldcf.sort
         FROM
             laws_data_center_folder ldcf
     </select>
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
index a8cb9fee..17931358 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFileServiceImpl.java
@@ -66,6 +66,7 @@ public class LawsDataCenterFileServiceImpl extends ServiceImpl<LawsDataCenterFil
 	@Override
     public void add(LawsDataCenterFile lawsDataCenterFile) {
 		lawsDataCenterFile.setOwnerId(CurrentUserUtil.getId());
+		lawsDataCenterFile.setOrgCode(CurrentUserUtil.getOrgCode());
         save(lawsDataCenterFile);
     }
 
diff --git a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
index 35645a07..71f7ae3e 100644
--- a/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
+++ b/laws-modules/src/main/java/com/jero/modules/laws/dataCenter/service/impl/LawsDataCenterFolderServiceImpl.java
@@ -5,6 +5,7 @@ import com.jero.modules.laws.common.util.CurrentUserUtil;
 import com.jero.modules.laws.dataCenter.entity.LawsDataCenterFolder;
 import com.jero.modules.laws.dataCenter.mapper.LawsDataCenterFolderMapper;
 import com.jero.modules.laws.dataCenter.service.ILawsDataCenterFolderService;
+import org.apache.commons.lang3.StringUtils;
 import org.apache.shiro.SecurityUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -53,6 +54,10 @@ public class LawsDataCenterFolderServiceImpl extends ServiceImpl<LawsDataCenterF
 	@Override
     public void add(LawsDataCenterFolder lawsDataCenterFolder) {
 		lawsDataCenterFolder.setOwnerId(CurrentUserUtil.getId());
+		lawsDataCenterFolder.setOrgCode(CurrentUserUtil.getOrgCode());
+		if (StringUtils.isBlank(lawsDataCenterFolder.getParentId())) {
+			lawsDataCenterFolder.setParentId("0");
+		}
         save(lawsDataCenterFolder);
     }