Browse Source

Merge remote-tracking branch 'origin/master'

csg6 10 months ago
parent
commit
601d72236f

+ 28 - 0
ruoyi-common/src/main/java/com/ruoyi/common/core/domain/entity/SysDept.java

@@ -52,6 +52,16 @@ public class SysDept extends BaseEntity
52 52
     /** 父部门名称 */
53 53
     private String parentName;
54 54
 
55
+    /**
56
+     * 部门编码
57
+     */
58
+    private String deptCode;
59
+
60
+    /**
61
+     * 1 职能部门 2 生产部门 3 其他
62
+     */
63
+    private int type;
64
+
55 65
     /** 子部门 */
56 66
     private List<SysDept> children = new ArrayList<SysDept>();
57 67
 
@@ -181,6 +191,22 @@ public class SysDept extends BaseEntity
181 191
         this.children = children;
182 192
     }
183 193
 
194
+    public String getDeptCode() {
195
+        return deptCode;
196
+    }
197
+
198
+    public void setDeptCode(String deptCode) {
199
+        this.deptCode = deptCode;
200
+    }
201
+
202
+    public int getType() {
203
+        return type;
204
+    }
205
+
206
+    public void setType(int type) {
207
+        this.type = type;
208
+    }
209
+
184 210
     @Override
185 211
     public String toString() {
186 212
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -198,6 +224,8 @@ public class SysDept extends BaseEntity
198 224
             .append("createTime", getCreateTime())
199 225
             .append("updateBy", getUpdateBy())
200 226
             .append("updateTime", getUpdateTime())
227
+            .append("deptCode", getDeptCode())
228
+            .append("type", getType())
201 229
             .toString();
202 230
     }
203 231
 }

+ 29 - 1
ruoyi-system/src/main/java/com/ruoyi/system/domain/SysPost.java

@@ -38,6 +38,16 @@ public class SysPost extends BaseEntity
38 38
     @Excel(name = "状态", readConverterExp = "0=正常,1=停用")
39 39
     private String status;
40 40
 
41
+    /**
42
+     * 部门id
43
+     */
44
+    private Long deptId;
45
+
46
+    /**
47
+     * 级别:0-不设置;1-经理;
48
+     */
49
+    private Integer postLevel;
50
+
41 51
     /** 用户是否存在此岗位标识 默认不存在 */
42 52
     private boolean flag = false;
43 53
 
@@ -105,7 +115,23 @@ public class SysPost extends BaseEntity
105 115
     {
106 116
         this.flag = flag;
107 117
     }
108
-    
118
+
119
+    public Long getDeptId() {
120
+        return deptId;
121
+    }
122
+
123
+    public void setDeptId(Long deptId) {
124
+        this.deptId = deptId;
125
+    }
126
+
127
+    public Integer getPostLevel() {
128
+        return postLevel;
129
+    }
130
+
131
+    public void setPostLevel(Integer postLevel) {
132
+        this.postLevel = postLevel;
133
+    }
134
+
109 135
     @Override
110 136
     public String toString() {
111 137
         return new ToStringBuilder(this,ToStringStyle.MULTI_LINE_STYLE)
@@ -119,6 +145,8 @@ public class SysPost extends BaseEntity
119 145
             .append("updateBy", getUpdateBy())
120 146
             .append("updateTime", getUpdateTime())
121 147
             .append("remark", getRemark())
148
+            .append("deptId", getDeptId())
149
+            .append("postLevel", getPostLevel())
122 150
             .toString();
123 151
     }
124 152
 }