|
@@ -73,8 +73,8 @@ public class TrainUtils {
|
|
|
ResourceDept dept = new ResourceDept();
|
|
ResourceDept dept = new ResourceDept();
|
|
|
dept.setDept_id(data.get("id").toString());
|
|
dept.setDept_id(data.get("id").toString());
|
|
|
dept.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
|
|
dept.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
|
|
|
- if (ObjectUtil.isNotEmpty(data.get("tenant_code"))) {
|
|
|
|
|
- dept.setTenantId(data.get("tenant_code").toString());
|
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(data.get("tenantId"))) {
|
|
|
|
|
+ dept.setTenantId(data.get("tenantId").toString());
|
|
|
} else {
|
|
} else {
|
|
|
dept.setTenantId(defaultConfig.getTenantId());
|
|
dept.setTenantId(defaultConfig.getTenantId());
|
|
|
}
|
|
}
|
|
@@ -101,8 +101,8 @@ public class TrainUtils {
|
|
|
person.setCategory(DefaultConstants.CATEGORY_TRAINEE);
|
|
person.setCategory(DefaultConstants.CATEGORY_TRAINEE);
|
|
|
person.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
|
|
person.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
|
|
|
person.setPostCode(DefaultConstants.TRAINEE_CODE);
|
|
person.setPostCode(DefaultConstants.TRAINEE_CODE);
|
|
|
- if (ObjectUtil.isNotEmpty(data.get("tenantCode"))) {
|
|
|
|
|
- person.setTenantId(data.get("tenantCode").toString());
|
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(data.get("tenantId"))) {
|
|
|
|
|
+ person.setTenantId(data.get("tenantId").toString());
|
|
|
} else {
|
|
} else {
|
|
|
person.setTenantId(defaultConfig.getTenantId());
|
|
person.setTenantId(defaultConfig.getTenantId());
|
|
|
}
|
|
}
|
|
@@ -120,8 +120,8 @@ public class TrainUtils {
|
|
|
person.setUserId(data.getStr("id"));
|
|
person.setUserId(data.getStr("id"));
|
|
|
person.setDeptId(data.getStr("classId"));
|
|
person.setDeptId(data.getStr("classId"));
|
|
|
person.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
|
|
person.setOperatorId(DefaultConstants.KAFKA_SYNC_ADMIN);
|
|
|
- if (ObjectUtil.isNotEmpty(data.get("tenantCode"))) {
|
|
|
|
|
- person.setTenantId(data.get("tenantCode").toString());
|
|
|
|
|
|
|
+ if (ObjectUtil.isNotEmpty(data.get("tenantId"))) {
|
|
|
|
|
+ person.setTenantId(data.get("tenantId").toString());
|
|
|
} else {
|
|
} else {
|
|
|
person.setTenantId(defaultConfig.getTenantId());
|
|
person.setTenantId(defaultConfig.getTenantId());
|
|
|
}
|
|
}
|