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-01-06 14:35:58 +08:00
parent 228cd54e29
commit 832f36e0a1
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/entity/NuAppEmployessPermission.java
View File

@ -40,6 +40,10 @@ public class NuAppEmployessPermission implements Serializable {
@Excel(name = "角色id", width = 15) @Excel(name = "角色id", width = 15)
@ApiModelProperty(value = "角色id") @ApiModelProperty(value = "角色id")
private java.lang.String roleId; private java.lang.String roleId;
/**区域id*/
@Excel(name = "区域id", width = 15)
@ApiModelProperty(value = "区域id")
private java.lang.String nuId;
/**权限id*/ /**权限id*/
@Excel(name = "权限id", width = 15) @Excel(name = "权限id", width = 15)
@ApiModelProperty(value = "权限id") @ApiModelProperty(value = "权限id")

2
nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java
View File

@ -74,7 +74,7 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>(); Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
QueryWrapper<NuBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap); QueryWrapper<NuBaseInfo> queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap);
queryWrapper.like(StringUtils.isNotBlank(nuBaseInfo.getNuNameParams()),"a.nu_name",nuBaseInfo.getNuNameParams()); queryWrapper.like(StringUtils.isNotBlank(nuBaseInfo.getNuNameParams()),"a.nu_name",nuBaseInfo.getNuNameParams());
queryWrapper.isNotNull("b.id"); // queryWrapper.isNotNull("b.id");
Page<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize); Page<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize);
IPage<NuBaseInfo> pageList = nuBaseInfoService.qyList(page, queryWrapper); IPage<NuBaseInfo> pageList = nuBaseInfoService.qyList(page, queryWrapper);
return Result.OK(pageList); return Result.OK(pageList);

1
nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java
View File

@ -123,6 +123,7 @@ public class CareOrders implements Serializable {
/**是否删除 0未删除 1删除*/ /**是否删除 0未删除 1删除*/
private String delFlag; private String delFlag;
/**PAD路径*/ /**PAD路径*/
@TableField(exist = false)
private String padPath; private String padPath;
/**接单上限*/ /**接单上限*/