|
|
@@ -692,6 +692,9 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
Long[] roleIds = {roleId};
|
|
|
if (metaEmployeeDiys.size() > 0) {
|
|
|
|
|
|
+ String deptName = configService.selectConfigByKey("ysl.dept.orgName");
|
|
|
+ String deptCode = configService.selectConfigByKey("ysl.dept.orgCode");
|
|
|
+
|
|
|
Set<String> companyPostNameSet = getConfigValueSet("ysl_comp_postname");
|
|
|
Set<String> officePostNameSet = getConfigValueSet("ysl_office_postname");
|
|
|
Set<String> empPostNameSet = getConfigValueSet("ysl_emp_postname");
|
|
|
@@ -730,8 +733,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
|
|
|
if (companyPostNameSet.contains(postName)) {
|
|
|
userExt.setSalesLevel("ysl_diy");
|
|
|
- userExt.setOrgName(m.getStext4());
|
|
|
- setExtOrgCodeY9(salesTreeMap, 3, userExt);
|
|
|
+ userExt.setOrgName(deptName);
|
|
|
+ userExt.setOrgCode(deptCode);
|
|
|
} else if (officePostNameSet.contains(postName)) {
|
|
|
userExt.setSalesLevel("ysl_office");
|
|
|
userExt.setOrgName(m.getStext5());
|
|
|
@@ -742,6 +745,15 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
setExtOrgCodeY9(salesTreeMap, 4, userExt);
|
|
|
} else {
|
|
|
log.error("YSL用户对应的岗位未找到!当前用户信息: " + m.getLoginName() + " , 岗位名称: " + postName);
|
|
|
+ SyncFailDetail syncFailDetail = new SyncFailDetail();
|
|
|
+ syncFailDetail.setPackageId(packageId);
|
|
|
+ syncFailDetail.setFailReason("YSL用户对应的岗位未找到!当前用户信息: " + m.getLoginName() + " , 岗位名称: " + postName);
|
|
|
+ syncFailDetail.setDataJson(JSONObject.toJSONString(m));
|
|
|
+ syncFailDetail.setFailLevel("1");
|
|
|
+ syncFailDetail.setExceptionType("not found post");
|
|
|
+ failDetails.add(syncFailDetail);
|
|
|
+ failCount++;
|
|
|
+ continue;
|
|
|
}
|
|
|
|
|
|
/**======== 构建diy用户扩展信息表 end===============*/
|