修改bug
This commit is contained in:
parent
228cd54e29
commit
832f36e0a1
|
|
@ -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")
|
||||
|
|
|
|||
|
|
@ -74,7 +74,7 @@ public class NuBaseInfoController extends JeecgController<NuBaseInfo, INuBaseInf
|
|||
Map<String, QueryRuleEnum> customeRuleMap = new HashMap<>();
|
||||
QueryWrapper<NuBaseInfo> 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<NuBaseInfo> page = new Page<NuBaseInfo>(pageNo, pageSize);
|
||||
IPage<NuBaseInfo> pageList = nuBaseInfoService.qyList(page, queryWrapper);
|
||||
return Result.OK(pageList);
|
||||
|
|
|
|||
|
|
@ -123,6 +123,7 @@ public class CareOrders implements Serializable {
|
|||
/**是否删除 0未删除 1删除*/
|
||||
private String delFlag;
|
||||
/**PAD路径*/
|
||||
@TableField(exist = false)
|
||||
private String padPath;
|
||||
|
||||
/**接单上限*/
|
||||
|
|
|
|||
Loading…
Reference in New Issue