fix deptId

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

@@ -55,7 +55,7 @@ public class Employee extends SysUser {
 	private String certificateNum;
 
 	@ApiModelProperty(value = "社保部门id",required = false)
-	private Integer depId;
+	private Integer deptId;
 
 	@ApiModelProperty(value = "部门ids",required = false)
 	private String depIds;
@@ -274,11 +274,11 @@ public class Employee extends SysUser {
 		this.postDeptIds = postDeptIds;
 	}
 
-	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;
 	}
 }

mec-biz/src/main/java/com/ym/mec/biz/service/impl/OaServiceImpl.java

@@ -28,7 +28,7 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
         oaUser.setSex(employee.getGender().toString());
-        oaUser.setDeptId(employee.getDepId());
+        oaUser.setDeptId(employee.getDeptId());
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
@@ -48,7 +48,7 @@ public class OaServiceImpl implements OaUserService {
         oaUser.setNickName(employee.getRealName());
         oaUser.setPhone(employee.getPhone());
         oaUser.setSex(employee.getGender().toString());
-        oaUser.setDeptId(employee.getDepId());
+        oaUser.setDeptId(employee.getDeptId());
         oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
         oaUser.setAvatar(employee.getAvatar());
         oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));

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

@@ -139,7 +139,7 @@ public class EmployeeController extends BaseController {
             sysUser.setRoles(employeeDao.queryUserRole(sysUser.getId()));
             sysUser.setContactAddress(employee.getContactAddress());
             sysUser.setPostalCode(employee.getPostalCode());
-            sysUser.setDeptId(employee.getDepId());
+            sysUser.setDeptId(employee.getDeptId());
             sysUser.setDeptIds(employee.getDeptIds());
             sysUser.setPostIds(employee.getPostIds());
             sysUser.setBankCard(employee.getBankCard());