From 2b371d31135d964553633d3cfb83c611e39dcfd3 Mon Sep 17 00:00:00 2001
From: haozq <1611483981@qq.com>
Date: Wed, 19 Feb 2025 18:20:24 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E6=9D=83=E9=99=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../bonus/gs/sub/evaluate/GsSubEvaluateApplication.java    | 1 +
 .../gs/sub/evaluate/evaluate/beans/OrganizationalBean.java | 2 ++
 .../evaluate/service/OrganizationalServiceImpl.java        | 3 +++
 src/main/resources/static/js/evaluate/org/orgList.js       | 7 ++++++-
 4 files changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java b/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java
index 6e3797f..99a18b0 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/GsSubEvaluateApplication.java
@@ -15,5 +15,6 @@ public class GsSubEvaluateApplication {
 
 	public static void main(String[] args) {
 		SpringApplication.run(GsSubEvaluateApplication.class, args);
+		System.err.println("甘肃考试分包商评价系统启动成功");
 	}
 }
diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java
index cb4fd30..b2aee3d 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/OrganizationalBean.java
@@ -39,6 +39,8 @@ public class OrganizationalBean {
 
     private String keyWorld;
 
+    private String parentUserName;
+
     private List<OrganizationalBean> children;
     /**
      * 是否是新增
diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java
index 12a42f4..5c67767 100644
--- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java
+++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java
@@ -330,6 +330,9 @@ public class OrganizationalServiceImpl implements OrganizationalService {
                 .collect(Collectors.toList());
 
         if (!children.isEmpty()) {
+            for (OrganizationalBean vo:children){
+                vo.setParentUserName(parent.getUserName());
+            }
             parent.setChildren(children);
             for (OrganizationalBean child : children) {
                 buildChildren(child, nodes);
diff --git a/src/main/resources/static/js/evaluate/org/orgList.js b/src/main/resources/static/js/evaluate/org/orgList.js
index f9f4456..2c32df5 100644
--- a/src/main/resources/static/js/evaluate/org/orgList.js
+++ b/src/main/resources/static/js/evaluate/org/orgList.js
@@ -116,16 +116,21 @@ function initTreeTable() {
             {
                 fixed: 'right', width: '20%', title: '操作', align: 'center', templet: d => {
                     let html = "";
+
                     if ([1, 2, 3, 4].includes(d.level)) {
                         if(user.roleId == 6 || user.roleId == 5){
                             html += '<a lay-event="add" style="color: #009688;cursor: pointer;font-size: 15px" id="add">新增</a>';
                         }
-                        if(user.roleId == 7 && d.level == 4 && d.userName == user.nickname){
+                        if(user.roleId == 7 && d.level == 4 &&(d.userName == user.nickname ||  d.parentUserName==user.nickname)   ){
                             html += '<a lay-event="add" style="color: #009688;cursor: pointer;font-size: 15px" id="add">新增</a>';
                         }
                         if(user.roleId == 7 && d.level == 3 && d.userName == user.nickname){
                             html += '<a lay-event="add" style="color: #009688;cursor: pointer;font-size: 15px" id="add">新增</a>';
                         }
+
+
+
+
                     }
                     if (d.level === 5) {
                         if(user.roleId == 6 || user.roleId == 5){