diff --git a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/entity/NuAppEmployessPermission.java b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/entity/NuAppEmployessPermission.java index c34abd80..ebe337ca 100644 --- a/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/entity/NuAppEmployessPermission.java +++ b/nursing-unit-employee/nu-employee-biz/src/main/java/com/nu/modules/employessPermission/entity/NuAppEmployessPermission.java @@ -40,6 +40,10 @@ public class NuAppEmployessPermission implements Serializable { @Excel(name = "角色id", width = 15) @ApiModelProperty(value = "角色id") private java.lang.String roleId; + /**区域id*/ + @Excel(name = "区域id", width = 15) + @ApiModelProperty(value = "区域id") + private java.lang.String nuId; /**权限id*/ @Excel(name = "权限id", width = 15) @ApiModelProperty(value = "权限id") diff --git a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java index 2eb37665..752f1072 100644 --- a/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java +++ b/nursing-unit-nu/nu-nu-biz/src/main/java/com/nu/modules/nubaseinfo/controller/NuBaseInfoController.java @@ -74,7 +74,7 @@ public class NuBaseInfoController extends JeecgController customeRuleMap = new HashMap<>(); QueryWrapper queryWrapper = QueryGenerator.initQueryWrapper(nuBaseInfo, req.getParameterMap(), customeRuleMap); queryWrapper.like(StringUtils.isNotBlank(nuBaseInfo.getNuNameParams()),"a.nu_name",nuBaseInfo.getNuNameParams()); - queryWrapper.isNotNull("b.id"); +// queryWrapper.isNotNull("b.id"); Page page = new Page(pageNo, pageSize); IPage pageList = nuBaseInfoService.qyList(page, queryWrapper); return Result.OK(pageList); diff --git a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java index 96d8f921..b179d57e 100644 --- a/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java +++ b/nursing-unit-services/nu-services-biz/src/main/java/com/nu/modules/biz/care/order/entity/CareOrders.java @@ -123,6 +123,7 @@ public class CareOrders implements Serializable { /**是否删除 0未删除 1删除*/ private String delFlag; /**PAD路径*/ + @TableField(exist = false) private String padPath; /**接单上限*/