From 09b397cc4ba181b5559135b1f73c947c4cbb11ca Mon Sep 17 00:00:00 2001
From: fengshuonan <sn93@qq.com>
Date: Wed, 6 Jan 2021 21:06:11 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90org=E3=80=91=E6=95=B4=E7=90=86?=
 =?UTF-8?q?=E4=BB=A3=E7=A0=81=E8=A7=84=E8=8C=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../system/pojo/organization/HrOrganizationRequest.java  | 1 -
 .../organization/layui/LayuiOrganizationTreeNode.java    | 2 --
 .../controller/HrOrganizationController.java             | 1 -
 .../organization/factory/OrganizationFactory.java        | 9 ++++++++-
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java
index f9e1c2a76..1504b0260 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/HrOrganizationRequest.java
@@ -35,7 +35,6 @@ public class HrOrganizationRequest extends BaseRequest {
     /**
      * 父ids
      */
-    //@NotBlank(message = "父ids不能为空", groups = {add.class, edit.class})
     private String orgPids;
 
     /**
diff --git a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/layui/LayuiOrganizationTreeNode.java b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/layui/LayuiOrganizationTreeNode.java
index 3af74176c..246faea6f 100644
--- a/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/layui/LayuiOrganizationTreeNode.java
+++ b/kernel-s-system/system-api/src/main/java/cn/stylefeng/roses/kernel/system/pojo/organization/layui/LayuiOrganizationTreeNode.java
@@ -14,7 +14,6 @@ import java.util.List;
 @Data
 public class LayuiOrganizationTreeNode implements AbstractTreeNode {
 
-
     /**
      * 父id，一级节点父id是0
      */
@@ -35,7 +34,6 @@ public class LayuiOrganizationTreeNode implements AbstractTreeNode {
      */
     private boolean spread = true;
 
-
     /**
      * 子节点的集合
      */
diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java
index 700ca2b74..631d24065 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/controller/HrOrganizationController.java
@@ -118,7 +118,6 @@ public class HrOrganizationController {
         return new SuccessResponseData(hrOrganizationService.tree(hrOrganizationRequest));
     }
 
-
     /**
      * 获取全部系统组织机构树，用于新增，编辑时选择上级节点
      *
diff --git a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java
index 8418a7dae..ae647d29b 100644
--- a/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java
+++ b/kernel-s-system/system-business-organization/src/main/java/cn/stylefeng/roses/kernel/system/modular/organization/factory/OrganizationFactory.java
@@ -3,12 +3,18 @@ package cn.stylefeng.roses.kernel.system.modular.organization.factory;
 import cn.stylefeng.roses.kernel.system.modular.organization.entity.HrOrganization;
 import cn.stylefeng.roses.kernel.system.pojo.organization.layui.LayuiOrganizationTreeNode;
 
+/**
+ * 组织机构实体转化
+ *
+ * @author chenjinlong
+ * @date 2021/1/6 21:03
+ */
 public class OrganizationFactory {
 
     /**
      * 实体转换
      *
-     * @param hrOrganization 机构
+     * @param hrOrganization 机构信息
      * @return LayuiOrganizationTreeNode layui树实体对象
      * @author chenjinlong
      * @date 2021/1/5 21:07
@@ -20,4 +26,5 @@ public class OrganizationFactory {
         treeNode.setTitle(hrOrganization.getOrgName());
         return treeNode;
     }
+
 }