From 1f9b64476716a6a1de3bcb886bf4e64b123f7523 Mon Sep 17 00:00:00 2001
From: jiangqs <jiangqs>
Date: 星期四, 06 七月 2023 18:28:31 +0800
Subject: [PATCH] 管理台bug和用户端活动商品购买
---
ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java | 52 ++++++++++++++++++++++++++++++++++++++++++++--------
1 files changed, 44 insertions(+), 8 deletions(-)
diff --git a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java
index d07797a..7d75726 100644
--- a/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java
+++ b/ruoyi-api/ruoyi-api-system/src/main/java/com/ruoyi/system/api/domain/poji/sys/SysDept.java
@@ -1,14 +1,15 @@
package com.ruoyi.system.api.domain.poji.sys;
-import java.util.ArrayList;
-import java.util.List;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.NotNull;
-import javax.validation.constraints.Size;
+import com.ruoyi.common.core.annotation.Excel;
+import com.ruoyi.common.core.web.domain.BaseEntity;
import org.apache.commons.lang3.builder.ToStringBuilder;
import org.apache.commons.lang3.builder.ToStringStyle;
-import com.ruoyi.common.core.web.domain.BaseEntity;
+
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Size;
+import java.util.ArrayList;
+import java.util.List;
/**
* 部门表 sys_dept
@@ -51,9 +52,19 @@
/** 父部门名称 */
private String parentName;
+
+ /** 数据范围（1：所有数据权限；2：自定义数据权限；3：本部门数据权限；4：本部门及以下数据权限；5：仅本人数据权限） */
+ @Excel(name = "数据范围", readConverterExp = "1=所有数据权限,2=自定义数据权限,3=本部门数据权限,4=本部门及以下数据权限,5=仅本人数据权限")
+ private String dataScope;
/** 子部门 */
private List<SysDept> children = new ArrayList<SysDept>();
+
+ /** 菜单组 */
+ private Long[] menuIds;
+
+ /** 菜单组 */
+ private Long[] staffMenuIds;
public Long getDeptId()
{
@@ -97,7 +108,7 @@
this.deptName = deptName;
}
- @NotNull(message = "显示顺序不能为空")
+ //@NotNull(message = "显示顺序不能为空")
public Integer getOrderNum()
{
return orderNum;
@@ -181,6 +192,30 @@
this.children = children;
}
+ public String getDataScope() {
+ return dataScope;
+ }
+
+ public void setDataScope(String dataScope) {
+ this.dataScope = dataScope;
+ }
+
+ public Long[] getMenuIds() {
+ return menuIds;
+ }
+
+ public void setMenuIds(Long[] menuIds) {
+ this.menuIds = menuIds;
+ }
+
+ public Long[] getStaffMenuIds() {
+ return staffMenuIds;
+ }
+
+ public void setStaffMenuIds(Long[] staffMenuIds) {
+ this.staffMenuIds = staffMenuIds;
+ }
+
@Override
public String toString() {
return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -198,6 +233,7 @@
.append("createTime", getCreateTime())
.append("updateBy", getUpdateBy())
.append("updateTime", getUpdateTime())
+ .append("dataScope", getDataScope())
.toString();
}
}
--
Gitblit v1.7.1