From 422a57efd0aed12921befafad3bbae4fea52e91c Mon Sep 17 00:00:00 2001
From: yangjun <1173114630@qq.com>
Date: Wed, 6 May 2026 15:05:57 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../NuAppEmployeesPermissionController.java   | 29 -------------------
 .../mapper/xml/NuBaseInfoMapper.xml           |  1 -
 .../entity/NuAppNuidPermission.java           |  5 ++++
 3 files changed, 5 insertions(+), 30 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 363732c4..cd657556 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
@@ -197,10 +197,6 @@ public class NuAppEmployeesPermissionController extends JeecgController<NuAppEmp
 		 //全部权限ids
 		 List<String> ids = new ArrayList<>();
 		 try {
-//			 LambdaQueryWrapper<NuAppPermission> query = new LambdaQueryWrapper<NuAppPermission>();
-//			 query.eq(NuAppPermission::getDelFlag, CommonConstant.DEL_FLAG_0);
-//			 query.orderByAsc(NuAppPermission::getSortNo);
-//			 List<NuAppPermission> list = nuAppPermissionService.list(query);
 
 			 List<NuAppNuidPermission> list = nuAppNuidPermissionService.getAppPermissionList();
 			 for(NuAppNuidPermission sysPer : list) {
@@ -209,16 +205,9 @@ public class NuAppEmployeesPermissionController extends JeecgController<NuAppEmp
 			 List<TreeModel> nuList = new ArrayList<>();
 			 getTreeModelList(nuList, list, null);
 
-			 List<DictModel> listModel = sysBaseAPI.getDictItems("service_instruction_tag");
-			 for(DictModel sysPer : listModel) {
-				 ids.add(sysPer.getValue());
-			 }
-			 List<TreeModel> treeList = new ArrayList<>();
-			 getCheckTreeModelList(treeList, listModel, null);
 			 Map<String,Object> resMap = new HashMap(5);
 			 //全部树节点数据
 			 resMap.put("nuList", nuList);
-			 resMap.put("treeList", treeList);
 			 //全部树ids
 			 resMap.put("ids", ids);
 			 result.setResult(resMap);
@@ -248,24 +237,6 @@ public class NuAppEmployeesPermissionController extends JeecgController<NuAppEmp
 		 }
 	 }
 
-	 private void getCheckTreeModelList(List<TreeModel> treeList, List<DictModel> 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/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
index 817ccf5b..24d83d78 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
@@ -17,7 +17,6 @@
     <select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
         select distinct a.*
         from nu_base_info a
-                 left join nu_iot_tplink_camera b on a.nu_id = b.nu_id
             ${ew.customSqlSegment}
     </select>
     <!--    <select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">-->
diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/entity/NuAppNuidPermission.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/entity/NuAppNuidPermission.java
index 56f7726b..35ef5eff 100644
--- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/entity/NuAppNuidPermission.java
+++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/entity/NuAppNuidPermission.java
@@ -64,6 +64,11 @@ public class NuAppNuidPermission implements Serializable {
     @TableField(exist = false)
     private String menuCode;
 
+    @TableField(exist = false)
+    private Integer ruleFlag;
+    @TableField(value="is_leaf")
+    private boolean leaf;
+
 
 
     public NuAppNuidPermission(String roleId, String permissionId) {