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<NuAppEmp
 	@Autowired
 	private INuAppEmployeesPermissionService nuAppEmployeesPermissionService;
 
+	 @Autowired
+	 private INuAppNuidPermissionService nuAppNuidPermissionService;
+
 	 @Autowired
 	 private INuAppPermissionService nuAppPermissionService;
 	 @Autowired
 	 private BaseCommonService baseCommonService;
+
+	 @Autowired
+	 private ISysBaseAPI sysBaseAPI;
 	/**
 	 * 分页列表查询
 	 *
@@ -187,17 +197,27 @@ 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);
-			 for(NuAppPermission sysPer : list) {
+//			 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) {
 				 ids.add(sysPer.getId());
 			 }
+			 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<>();
-			 getTreeModelList(treeList, list, null);
+			 getCheckTreeModelList(treeList, listModel, null);
 			 Map<String,Object> 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<NuAppEmp
 		 return result;
 	 }
 
-	 private void getTreeModelList(List<TreeModel> treeList, List<NuAppPermission> 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<TreeModel> treeList, List<NuAppNuidPermission> 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<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/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<NuAppNuidPermission> {
 
     List<NuAppNuidPermission> listByNuId(@Param("roleId") String nuId);
+
+    List<NuAppNuidPermission> 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 @@
             </if>
         </where>
     </select>
+
+    <select id="getAppPermissionList" resultType="com.nu.modules.nuidPermission.entity.NuAppNuidPermission">
+        select a.*,b.name as menu_name,b.menu_code from nu_app_nuid_permission a
+       left join nu_app_permission b on a.permission_id = b.id
+    </select>
 </mapper>
\ 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<NuAppNuidPermissio
     void saveRolePermission(String roleId, String permissionIds, String lastPermissionIds);
 
     List<NuAppNuidPermission> listByNuId(String nuId);
+
+    List<NuAppNuidPermission> 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<NuAppNuidPermiss
         return baseMapper.listByNuId(nuId);
     }
 
+    @Override
+    public List<NuAppNuidPermission> getAppPermissionList() {
+        return baseMapper.getAppPermissionList();
+    }
+
     /**
      * 从diff中找出main中没有的元素
      * @param main