From 70509c298c6cd6c062e3b8483038ee40404ff280 Mon Sep 17 00:00:00 2001 From: yangjun <1173114630@qq.com> Date: Thu, 12 Mar 2026 14:11:03 +0800 Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=91=98=E5=B7=A5=E6=9D=83?= =?UTF-8?q?=E9=99=90=E5=8A=9F=E8=83=BD?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../NuAppEmployeesPermissionController.java | 59 +++++++++++++++---- .../mapper/NuAppNuidPermissionMapper.java | 2 + .../mapper/xml/NuAppNuidPermissionMapper.xml | 5 ++ .../service/INuAppNuidPermissionService.java | 2 + .../impl/NuAppNuidPermissionServiceImpl.java | 5 ++ 5 files changed, 63 insertions(+), 10 deletions(-) diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/controller/NuAppEmployeesPermissionController.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/controller/NuAppEmployeesPermissionController.java index 1ebeebf6..363732c4 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/controller/NuAppEmployeesPermissionController.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/controller/NuAppEmployeesPermissionController.java @@ -11,10 +11,14 @@ import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper; import com.nu.modules.appConfig.entity.NuAppPermission; import com.nu.modules.appConfig.entity.TreeModel; import com.nu.modules.appConfig.service.INuAppPermissionService; +import com.nu.modules.nuidPermission.entity.NuAppNuidPermission; +import com.nu.modules.nuidPermission.service.INuAppNuidPermissionService; import org.apache.shiro.SecurityUtils; import org.jeecg.common.api.vo.Result; import org.jeecg.common.constant.CommonConstant; +import org.jeecg.common.system.api.ISysBaseAPI; import org.jeecg.common.system.query.QueryGenerator; +import org.jeecg.common.system.vo.DictModel; import org.jeecg.common.system.vo.LoginUser; import org.jeecg.common.util.oConvertUtils; import com.nu.modules.employeesPermission.entity.NuAppEmployeesPermission; @@ -49,10 +53,16 @@ public class NuAppEmployeesPermissionController extends JeecgController ids = new ArrayList<>(); try { - LambdaQueryWrapper query = new LambdaQueryWrapper(); - query.eq(NuAppPermission::getDelFlag, CommonConstant.DEL_FLAG_0); - query.orderByAsc(NuAppPermission::getSortNo); - List list = nuAppPermissionService.list(query); - for(NuAppPermission sysPer : list) { +// LambdaQueryWrapper query = new LambdaQueryWrapper(); +// query.eq(NuAppPermission::getDelFlag, CommonConstant.DEL_FLAG_0); +// query.orderByAsc(NuAppPermission::getSortNo); +// List list = nuAppPermissionService.list(query); + + List list = nuAppNuidPermissionService.getAppPermissionList(); + for(NuAppNuidPermission sysPer : list) { ids.add(sysPer.getId()); } + List nuList = new ArrayList<>(); + getTreeModelList(nuList, list, null); + + List listModel = sysBaseAPI.getDictItems("service_instruction_tag"); + for(DictModel sysPer : listModel) { + ids.add(sysPer.getValue()); + } List treeList = new ArrayList<>(); - getTreeModelList(treeList, list, null); + getCheckTreeModelList(treeList, listModel, null); Map resMap = new HashMap(5); //全部树节点数据 + resMap.put("nuList", nuList); resMap.put("treeList", treeList); //全部树ids resMap.put("ids", ids); @@ -209,10 +229,10 @@ public class NuAppEmployeesPermissionController extends JeecgController treeList, List metaList, TreeModel temp) { - for (NuAppPermission permission : metaList) { - String tempPid = permission.getParentId(); - TreeModel tree = new TreeModel(permission.getId(), tempPid, permission.getName(),permission.getRuleFlag(), permission.isLeaf(),permission.getMenuCode()); + private void getTreeModelList(List treeList, List metaList, TreeModel temp) { + for (NuAppNuidPermission permission : metaList) { + String tempPid = null; + TreeModel tree = new TreeModel(permission.getRoleId(), tempPid, permission.getMenuName(), 0, true,permission.getMenuCode()); if(temp==null && oConvertUtils.isEmpty(tempPid)) { treeList.add(tree); if(!tree.getIsLeaf()) { @@ -228,6 +248,25 @@ public class NuAppEmployeesPermissionController extends JeecgController treeList, List metaList, TreeModel temp) { + for (DictModel permission : metaList) { + String tempPid = null; + TreeModel tree = new TreeModel(permission.getValue(), tempPid, permission.getTitle(),0, true,permission.getValue()); + if(temp==null && oConvertUtils.isEmpty(tempPid)) { + treeList.add(tree); + if(!tree.getIsLeaf()) { + getCheckTreeModelList(treeList, metaList, tree); + } + }else if(temp!=null && tempPid!=null && tempPid.equals(temp.getKey())){ + temp.getChildren().add(tree); + if(!tree.getIsLeaf()) { + getCheckTreeModelList(treeList, metaList, tree); + } + } + + } + } + /** * 查询角色授权 * diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/NuAppNuidPermissionMapper.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/NuAppNuidPermissionMapper.java index 195968ef..a75ef7a0 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/NuAppNuidPermissionMapper.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/NuAppNuidPermissionMapper.java @@ -15,4 +15,6 @@ import com.baomidou.mybatisplus.core.mapper.BaseMapper; public interface NuAppNuidPermissionMapper extends BaseMapper { List listByNuId(@Param("roleId") String nuId); + + List getAppPermissionList(); } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/xml/NuAppNuidPermissionMapper.xml b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/xml/NuAppNuidPermissionMapper.xml index 5ce7cd22..0639192c 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/xml/NuAppNuidPermissionMapper.xml +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/mapper/xml/NuAppNuidPermissionMapper.xml @@ -11,4 +11,9 @@ + + \ No newline at end of file diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/INuAppNuidPermissionService.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/INuAppNuidPermissionService.java index 1a917802..8fdad9d6 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/INuAppNuidPermissionService.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/INuAppNuidPermissionService.java @@ -16,4 +16,6 @@ public interface INuAppNuidPermissionService extends IService listByNuId(String nuId); + + List getAppPermissionList(); } diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/impl/NuAppNuidPermissionServiceImpl.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/impl/NuAppNuidPermissionServiceImpl.java index 43334ed8..af48e882 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/impl/NuAppNuidPermissionServiceImpl.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/service/impl/NuAppNuidPermissionServiceImpl.java @@ -61,6 +61,11 @@ public class NuAppNuidPermissionServiceImpl extends ServiceImpl getAppPermissionList() { + return baseMapper.getAppPermissionList(); + } + /** * 从diff中找出main中没有的元素 * @param main