Merge branch '20220914' into master_saas

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());