update

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

@@ -4,6 +4,7 @@ import java.util.List;
 import java.util.Objects;
 import java.util.stream.Collectors;
 
+import org.apache.commons.lang3.StringUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.scheduling.annotation.Async;
 import org.springframework.stereotype.Service;
@@ -37,9 +38,14 @@ public class OaServiceImpl implements OaUserService {
 				oaUser.setSex(employee.getGender().toString());
 			}
 			oaUser.setDeptId(employee.getDeptId());
-			oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
+            	oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+            }
 			oaUser.setAvatar(employee.getAvatar());
-			oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
+            	oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+            }
 			if (oaUser.getPostDeptIds() != null) {
 				List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
 				oaUser.setPostIds(postIds);
@@ -55,9 +61,15 @@ public class OaServiceImpl implements OaUserService {
 				oaUser.setSex(employee.getGender().toString());
 			}
 			oaUser.setDeptId(employee.getDeptId());
-			oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
+            	oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
+            }
 			oaUser.setAvatar(employee.getAvatar());
-			oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
+            	oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
+            }
 			if (oaUser.getPostDeptIds() != null) {
 				List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
 				oaUser.setPostIds(postIds);
@@ -83,10 +95,10 @@ public class OaServiceImpl implements OaUserService {
             if(Objects.nonNull(employee.getDeptId())){
                 oaUser.setDeptId(employee.getDeptId());
             }
-            if(Objects.nonNull(employee.getDeptIds())){
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
                 oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
             }
-            if(Objects.nonNull(employee.getPostDeptIds())){
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
                 oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
                 List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
                 oaUser.setPostIds(postIds);
@@ -104,10 +116,10 @@ public class OaServiceImpl implements OaUserService {
             if(Objects.nonNull(employee.getDeptId())){
                 oaUser.setDeptId(employee.getDeptId());
             }
-            if(Objects.nonNull(employee.getDeptIds())){
+            if(StringUtils.isNotBlank(employee.getDeptIds())){
                 oaUser.setDeptIds(JSON.parseArray(employee.getDeptIds(), Integer.class));
             }
-            if(Objects.nonNull(employee.getPostDeptIds())){
+            if(StringUtils.isNotBlank(employee.getPostDeptIds())){
                 oaUser.setPostDeptIds(JSON.parseArray(employee.getPostDeptIds(), PostDept.class));
                 List<Integer> postIds = oaUser.getPostDeptIds().stream().map(PostDept::getPostId).collect(Collectors.toList());
                 oaUser.setPostIds(postIds);