river 4 éve
szülő
commit
0f88075ec5

+ 5 - 6
mec-auth/mec-auth-api/src/main/java/com/ym/mec/auth/api/entity/SysUser.java

@@ -1,6 +1,5 @@
 package com.ym.mec.auth.api.entity;
 
-import com.ym.mec.auth.api.enums.CertificateTypeEnum;
 import io.swagger.annotations.ApiModelProperty;
 
 import java.io.Serializable;
@@ -137,7 +136,7 @@ public class SysUser implements Serializable{
 	private String certificateType;
 
 	@ApiModelProperty(value = "部门id",required = false)
-	private Integer depId;
+	private Integer deptId;
 
 	@ApiModelProperty(value = "岗位id",required = false)
 	private Integer postId;
@@ -435,12 +434,12 @@ public class SysUser implements Serializable{
 		this.currentGradeNum = currentGradeNum;
 	}
 
-	public Integer getDepId() {
-		return depId;
+	public Integer getDeptId() {
+		return deptId;
 	}
 
-	public void setDepId(Integer depId) {
-		this.depId = depId;
+	public void setDeptId(Integer deptId) {
+		this.deptId = deptId;
 	}
 
 	public Integer getPostId() {

+ 3 - 3
mec-biz/src/main/java/com/ym/mec/biz/dal/entity/Employee.java

@@ -228,12 +228,12 @@ public class Employee extends SysUser {
 		return ToStringBuilder.reflectionToString(this);
 	}
 
-	public Integer getDepId() {
+	public Integer getDeptId() {
 		return depId;
 	}
 
-	public void setDepId(Integer depId) {
-		this.depId = depId;
+	public void setDeptId(Integer deptId) {
+		this.depId = deptId;
 	}
 
 	public Integer getPostId() {

+ 1 - 1
mec-web/src/main/java/com/ym/mec/web/controller/EmployeeController.java

@@ -136,7 +136,7 @@ public class EmployeeController extends BaseController {
             sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
             sysUser.setContactAddress(employee.getContactAddress());
             sysUser.setPostalCode(employee.getPostalCode());
-            sysUser.setDepId(employee.getDepId());
+            sysUser.setDeptId(employee.getDeptId());
             sysUser.setPostId(employee.getPostId());
             sysUser.setBankCard(employee.getBankCard());
             sysUser.setOpenBankAddress(employee.getOpenBankAddress());