mula
/
fourcal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

角色下面有人的才显示

master
xxssyyyyssxx 2021-11-26 19:07:12 +08:00
parent 710358e23c
commit dc4499a192
3 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/cn/palmte/work/model/SysRoleRepository.java
View File

@ -12,7 +12,7 @@ public interface SysRoleRepository extends JpaRepository<SysRole, Integer> {
* 分页查询所有角色 * 分页查询所有角色
* @return * @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(); public List<SysRole> findAllRole();

10
src/main/java/cn/palmte/work/service/ProjectService.java
View File

@ -248,9 +248,13 @@ public class ProjectService {
for (SysRole sysRole : roleList) { for (SysRole sysRole : roleList) {
zTreeNodes.add(new ZTreeNode(PREFIX_ROLE + sysRole.getId(), "0", sysRole.getName(), List<ZTreeNode> filterAdmins = filterAdmins(adminList, sysRole, visibleUserList);
isChecked(visibleRoleList, sysRole.getId()), false)); if(CollectionUtil.isNotEmpty(filterAdmins)){
zTreeNodes.addAll(filterAdmins(adminList, sysRole, visibleUserList)); //下面有人才要
zTreeNodes.add(new ZTreeNode(PREFIX_ROLE + sysRole.getId(), "0", sysRole.getName(),
isChecked(visibleRoleList, sysRole.getId()), false));
zTreeNodes.addAll(filterAdmins);
}
} }
return zTreeNodes; return zTreeNodes;

4
src/main/resources/templates/admin/project_estimate_add.ftl
View File

@ -36,7 +36,7 @@
<input type="text" class="am-form-field am-input-sm" id="startDate" <input type="text" class="am-form-field am-input-sm" id="startDate"
name="startDate" autocomplete="off" name="startDate" autocomplete="off"
value="" placeholder="项目计划开始时间" value="" placeholder="项目计划开始时间"
data-am-datepicker> data-am-datepicker required>
</div> </div>
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></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" <input type="text" class="am-form-field am-input-sm" id="endDate"
name="endDate" autocomplete="off" name="endDate" autocomplete="off"
value="" placeholder="项目计划结束时间" value="" placeholder="项目计划结束时间"
data-am-datepicker> data-am-datepicker required>
</div> </div>
</div> </div>
<div class="am-u-sm-2 am-u-md-4 input-msg"></div> <div class="am-u-sm-2 am-u-md-4 input-msg"></div>