yangjun
/
nursing_unit_java
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改bug

This commit is contained in:
yangjun 2026-05-06 15:05:57 +08:00
parent c55180f472
commit 422a57efd0
3 changed files with 5 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employeesPermission/controller/NuAppEmployeesPermissionController.java
View File

@ -197,10 +197,6 @@ public class NuAppEmployeesPermissionController extends JeecgController<NuAppEmp
//全部权限ids //全部权限ids
List<String> ids = new ArrayList<>(); List<String> ids = new ArrayList<>();
try { 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(); List<NuAppNuidPermission> list = nuAppNuidPermissionService.getAppPermissionList();
for(NuAppNuidPermission sysPer : list) { for(NuAppNuidPermission sysPer : list) {
@ -209,16 +205,9 @@ public class NuAppEmployeesPermissionController extends JeecgController<NuAppEmp
List<TreeModel> nuList = new ArrayList<>(); List<TreeModel> nuList = new ArrayList<>();
getTreeModelList(nuList, list, null); 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); Map<String,Object> resMap = new HashMap(5);
//全部树节点数据 //全部树节点数据
resMap.put("nuList", nuList); resMap.put("nuList", nuList);
resMap.put("treeList", treeList);
//全部树ids //全部树ids
resMap.put("ids", ids); resMap.put("ids", ids);
result.setResult(resMap); 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);
}
}
}
}
/** /**
* 查询角色授权 * 查询角色授权

1
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/mapper/xml/NuBaseInfoMapper.xml
View File

@ -17,7 +17,6 @@
<select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo"> <select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">
select distinct a.* select distinct a.*
from nu_base_info a from nu_base_info a
left join nu_iot_tplink_camera b on a.nu_id = b.nu_id
${ew.customSqlSegment} ${ew.customSqlSegment}
</select> </select>
<!-- <select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">--> <!-- <select id="qyList" resultType="com.nu.modules.nubaseinfo.entity.NuBaseInfo">-->

5
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nuidPermission/entity/NuAppNuidPermission.java
View File

@ -64,6 +64,11 @@ public class NuAppNuidPermission implements Serializable {
@TableField(exist = false) @TableField(exist = false)
private String menuCode; private String menuCode;
@TableField(exist = false)
private Integer ruleFlag;
@TableField(value="is_leaf")
private boolean leaf;
public NuAppNuidPermission(String roleId, String permissionId) { public NuAppNuidPermission(String roleId, String permissionId) {