From 82aa37e2ed3eec7d2e00d4359a7acdfb76c33c9f Mon Sep 17 00:00:00 2001
From: Chengliang <1546584672@qq.com>
Date: Mon, 27 Jun 2022 16:26:48 +0800
Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D=20=E5=A2=9E=E5=8A=A0?=
 =?UTF-8?q?=E5=AF=BC=E5=85=A5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/com/engine/organization/annotation/Log.java        |  7 +------
 .../organization/entity/extend/bo/ExtendGroupBO.java   | 10 ++++++++++
 .../organization/entity/fieldset/vo/TypeTreeVO.java    |  3 +++
 .../service/impl/HrmResourceServiceImpl.java           |  4 ++--
 4 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/src/com/engine/organization/annotation/Log.java b/src/com/engine/organization/annotation/Log.java
index 9ef0d9e0..0a7020d1 100644
--- a/src/com/engine/organization/annotation/Log.java
+++ b/src/com/engine/organization/annotation/Log.java
@@ -4,12 +4,7 @@ import com.engine.organization.enums.OperateTypeEnum;
 
 import java.lang.annotation.*;
 
-/**
- * @Author dxfeng
- * @Description:
- * @Date 2022/5/9
- * @Version V1.0
- **/
+
 @Target({ElementType.PARAMETER, ElementType.METHOD})
 @Retention(RetentionPolicy.RUNTIME)
 @Documented
diff --git a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
index 9848dd8b..a746d1cc 100644
--- a/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
+++ b/src/com/engine/organization/entity/extend/bo/ExtendGroupBO.java
@@ -31,6 +31,7 @@ public class ExtendGroupBO {
                 TypeTreeVO.builder()
                         .canClick(true)
                         .addChild(e.getPid() == null)
+                        .isSelected(isSelect(e.getId()))
                         .domid(String.valueOf(e.getId()))
                         .childs(Lists.newArrayList())
                         .hasGroup(isHasGroup(e.getId()))
@@ -90,4 +91,13 @@ public class ExtendGroupBO {
         }
         return tableName;
     }
+
+
+    private static boolean isSelect(Long id) {
+        if (id == 1 || id == 2 || id == 3 || id ==4) {
+            return true;
+        }else {
+            return false;
+        }
+    }
 }
diff --git a/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java b/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java
index 32c09f11..1b4f18a9 100644
--- a/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java
+++ b/src/com/engine/organization/entity/fieldset/vo/TypeTreeVO.java
@@ -69,4 +69,7 @@ public class TypeTreeVO {
     //父节点id
     private Long pid;
 
+    public boolean getIsSelected() {
+        return isSelected;
+    }
 }
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 37474de5..8dc22340 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -233,11 +233,11 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         Map<String, Object> btnDatas = new HashMap<>();
         ArrayList<MenuBtn> topMenuList = new ArrayList<>();
         ArrayList<MenuBtn> rightMenuList = new ArrayList<>();
-        // 新建人员
         topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
+        topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build());
         btnDatas.put("topMenu", topMenuList);
-        // 新建人员
         rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
+        rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("import").menuIcon("icon-coms-leading-in").menuName("导入人员").type("BTN_Import").build());
         btnDatas.put("rightMenu", rightMenuList);
         return btnDatas;
     }