fix

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

@@ -145,10 +145,17 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
                 employee.setUserId(user.getId());
                 employee.setId(user.getId());
                 employeeDao.insert(employee);
-                //新增用户角色
-                employeeDao.batchAddEmployeeRole(user.getId(), employee.getRoleIds(), tenantId);
-                //新增用户职位
-                employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
+
+                if (org.apache.commons.collections.CollectionUtils.isNotEmpty(employee.getRoleIds())) {
+                    //新增用户角色
+                    employeeDao.batchAddEmployeeRole(user.getId(), employee.getRoleIds(), tenantId);
+                }
+
+                if (org.apache.commons.collections.CollectionUtils.isNotEmpty(employee.getPositionIds())) {
+
+                    //新增用户职位
+                    employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
+                }
                 employee.setUserType(user.getUserType() + ",SYSTEM");
                 teacherDao.updateUser(employee);
                 return;
@@ -164,10 +171,16 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         teacherDao.addSysUser(employee);
         employee.setUserId(employee.getId());
         employeeDao.insert(employee);
-        //新增用户角色
-        employeeDao.batchAddEmployeeRole(employee.getId(), employee.getRoleIds(), tenantId);
-        //新增用户职位
-        employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
+
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(employee.getRoleIds())) {
+            //新增用户角色
+            employeeDao.batchAddEmployeeRole(employee.getId(), employee.getRoleIds(), tenantId);
+        }
+
+        if (org.apache.commons.collections.CollectionUtils.isNotEmpty(employee.getPositionIds())) {
+            //新增用户职位
+            employeePositionService.batchAddPosition(employee.getId(), employee.getPositionIds(), tenantId);
+        }
         //添加用户现金账户
         sysUserCashAccountDao.insert(new SysUserCashAccount(employee.getId(), tenantId, "CNY"));
         ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(), null));