修改：平台账号机构权限

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

@@ -95,6 +95,9 @@ public class Employee extends SysUser {
 	@ApiModelProperty(value = "机构id列表")
 	private List<Integer> tenantIds;
 
+	@ApiModelProperty(value = "创建该机构的人")
+    private Integer createTenantUserId;
+
 	private String contactAddress;
 
 	private String postalCode;
@@ -303,4 +306,12 @@ public class Employee extends SysUser {
     public void setTenantIds(List<Integer> tenantIds) {
         this.tenantIds = tenantIds;
     }
+
+    public Integer getCreateTenantUserId() {
+        return createTenantUserId;
+    }
+
+    public void setCreateTenantUserId(Integer createTenantUserId) {
+        this.createTenantUserId = createTenantUserId;
+    }
 }

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

@@ -132,16 +132,20 @@ public class EmployeeServiceImpl extends BaseServiceImpl<Integer, Employee> impl
         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));
-        employee.setImToken(imResult.getToken());
+//        ImResult imResult = imFeignService.register(new ImUserModel(employee.getId().toString(), employee.getUsername(), null));
+//        employee.setImToken(imResult.getToken());
         teacherDao.updateUser(employee);
         if (user != null) {
             employee.setAvatar(user.getAvatar());
         }
+        Integer userId = employee.getId();
+        if(Objects.nonNull(employee.getCreateTenantUserId())){
+            userId = employee.getCreateTenantUserId();
+        }
         //添加平台用户和机构的关系
-        addUserTenant(employee.getTenantIds(), tenantId, employee.getId());
+        addUserTenant(employee.getTenantIds(), tenantId, userId);
         //添加到OA
-        oaUserService.addOaUser(employee);
+//        oaUserService.addOaUser(employee);
     }
 
     /**

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

@@ -492,6 +492,8 @@ public class TenantInfoServiceImpl extends ServiceImpl<TenantInfoDao, TenantInfo
         e.setUserType(SysUserType.SYSTEM.getCode());
         e.setOrganIdList(String.valueOf(orgId));
         e.setPassword(pw);
+        e.setTenantIds(Lists.newArrayList(tenantInfo.getId()));
+        e.setCreateTenantUserId(tenantInfo.getCreatedBy());
         try {
             log.info("createUser >>>> {}", e);
             employeeService.add(e);