From dc4499a1924e0a91d09765c14d441bb9d58e7c05 Mon Sep 17 00:00:00 2001
From: xxssyyyyssxx <xxssyyyyssxx@126.com>
Date: Fri, 26 Nov 2021 19:07:12 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=92=E8=89=B2=E4=B8=8B=E9=9D=A2=E6=9C=89?=
 =?UTF-8?q?=E4=BA=BA=E7=9A=84=E6=89=8D=E6=98=BE=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/cn/palmte/work/model/SysRoleRepository.java   |  2 +-
 .../java/cn/palmte/work/service/ProjectService.java    | 10 +++++++---
 .../resources/templates/admin/project_estimate_add.ftl |  4 ++--
 3 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/src/main/java/cn/palmte/work/model/SysRoleRepository.java b/src/main/java/cn/palmte/work/model/SysRoleRepository.java
index da4996c..35b1e74 100644
--- a/src/main/java/cn/palmte/work/model/SysRoleRepository.java
+++ b/src/main/java/cn/palmte/work/model/SysRoleRepository.java
@@ -12,7 +12,7 @@ public interface SysRoleRepository  extends JpaRepository<SysRole, Integer> {
      * 分页查询所有角色
      * @return
      */
-    @Query(" from SysRole sp where sp.deleted=0 order by last_updated_time asc")
+    @Query(" from SysRole sp where sp.deleted=0 and sp.isEnable=1 order by last_updated_time asc")
     public List<SysRole> findAllRole();
 
 
diff --git a/src/main/java/cn/palmte/work/service/ProjectService.java b/src/main/java/cn/palmte/work/service/ProjectService.java
index 5390fa5..fc86626 100644
--- a/src/main/java/cn/palmte/work/service/ProjectService.java
+++ b/src/main/java/cn/palmte/work/service/ProjectService.java
@@ -248,9 +248,13 @@ public class ProjectService {
 
 
         for (SysRole sysRole : roleList) {
-            zTreeNodes.add(new ZTreeNode(PREFIX_ROLE + sysRole.getId(), "0", sysRole.getName(),
-                    isChecked(visibleRoleList, sysRole.getId()), false));
-            zTreeNodes.addAll(filterAdmins(adminList, sysRole, visibleUserList));
+            List<ZTreeNode> filterAdmins = filterAdmins(adminList, sysRole, visibleUserList);
+            if(CollectionUtil.isNotEmpty(filterAdmins)){
+                //下面有人才要
+                zTreeNodes.add(new ZTreeNode(PREFIX_ROLE + sysRole.getId(), "0", sysRole.getName(),
+                        isChecked(visibleRoleList, sysRole.getId()), false));
+                zTreeNodes.addAll(filterAdmins);
+            }
         }
 
         return zTreeNodes;
diff --git a/src/main/resources/templates/admin/project_estimate_add.ftl b/src/main/resources/templates/admin/project_estimate_add.ftl
index 924cb73..8c51e54 100644
--- a/src/main/resources/templates/admin/project_estimate_add.ftl
+++ b/src/main/resources/templates/admin/project_estimate_add.ftl
@@ -36,7 +36,7 @@
                                     <input type="text" class="am-form-field am-input-sm" id="startDate"
                                            name="startDate" autocomplete="off"
                                            value="" placeholder="项目计划开始时间"
-                                           data-am-datepicker>
+                                           data-am-datepicker required>
                                 </div>
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>
@@ -49,7 +49,7 @@
                                     <input type="text" class="am-form-field am-input-sm" id="endDate"
                                            name="endDate" autocomplete="off"
                                            value="" placeholder="项目计划结束时间"
-                                           data-am-datepicker>
+                                           data-am-datepicker required>
                                 </div>
                             </div>
                             <div class="am-u-sm-2 am-u-md-4 input-msg"></div>