Merge remote-tracking branch 'origin/master_saas' into master_saas

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

@@ -132,7 +132,7 @@ public class Teacher extends SysUser {
 	private Integer deptId;
 
 	@ApiModelProperty(value = "部门ids",required = false)
-	private String depIds;
+	private String deptIds;
 
 	@ApiModelProperty(value = "岗位管理部门",required = false)
 	private String postDeptIds;
@@ -417,12 +417,12 @@ public class Teacher extends SysUser {
 		this.deptId = deptId;
 	}
 
-	public String getDepIds() {
-		return depIds;
+	public String getDeptIds() {
+		return deptIds;
 	}
 
-	public void setDepIds(String depIds) {
-		this.depIds = depIds;
+	public void setDeptIds(String deptIds) {
+		this.deptIds = deptIds;
 	}
 
 	public String getPostDeptIds() {

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

@@ -76,7 +76,9 @@ public class OaServiceImpl implements OaUserService {
             oaUser.setUserName(employee.getRealName());
             oaUser.setNickName(employee.getRealName());
             oaUser.setPhone(employee.getPhone());
-            oaUser.setSex(employee.getGender().toString());
+			if (employee.getGender() != null) {
+				oaUser.setSex(employee.getGender().toString());
+			}
             oaUser.setAvatar(employee.getAvatar());
             if(Objects.nonNull(employee.getDeptId())){
                 oaUser.setDeptId(employee.getDeptId());
@@ -95,7 +97,9 @@ public class OaServiceImpl implements OaUserService {
             oaUser.setUserName(employee.getRealName());
             oaUser.setNickName(employee.getRealName());
             oaUser.setPhone(employee.getPhone());
-            oaUser.setSex(employee.getGender().toString());
+			if (employee.getGender() != null) {
+				oaUser.setSex(employee.getGender().toString());
+			}
             oaUser.setAvatar(employee.getAvatar());
             if(Objects.nonNull(employee.getDeptId())){
                 oaUser.setDeptId(employee.getDeptId());

mec-biz/src/main/resources/config/mybatis/TeacherMapper.xml

@@ -317,8 +317,8 @@
             <if test="deptId != null">
                 dept_id_ = #{deptId},
             </if>
-            <if test="depIds != null">
-                dept_ids_ = #{depIds},
+            <if test="deptIds != null">
+                dept_ids_ = #{deptIds},
             </if>
             <if test="postDeptIds != null">
                 post_dept_ids_ = #{postDeptIds},