|
@@ -1007,9 +1007,9 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
userExt.setPostName(postName);
|
|
userExt.setPostName(postName);
|
|
|
|
|
|
|
|
Set<String> sfaPostNameSet = getConfigValueSet("sfa_comp_postname");
|
|
Set<String> sfaPostNameSet = getConfigValueSet("sfa_comp_postname");
|
|
|
|
|
+ if (m.getBusinessUnit().equals("DIY")) {
|
|
|
if (sfaPostNameSet.contains(postName)) {
|
|
if (sfaPostNameSet.contains(postName)) {
|
|
|
userExt.setSalesLevel("diysfa_level");
|
|
userExt.setSalesLevel("diysfa_level");
|
|
|
- if (m.getBusinessUnit().equals("DIY")) {
|
|
|
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTree();
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTree();
|
|
|
Set<String> companySet = getConfigValueSet("libang_company_level_postname");
|
|
Set<String> companySet = getConfigValueSet("libang_company_level_postname");
|
|
|
if(companySet.contains(postName)){
|
|
if(companySet.contains(postName)){
|
|
@@ -1028,7 +1028,8 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
int i = getLevel(userExt,salesTreeMap);
|
|
int i = getLevel(userExt,salesTreeMap);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
- } else if (m.getBusinessUnit().equals("CW")) {
|
|
|
|
|
|
|
+ }
|
|
|
|
|
+ /* else if (m.getBusinessUnit().equals("CW")) {
|
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTreeY9();
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTreeY9();
|
|
|
Set<String> deptPostNameSet = getConfigValueSet("cw_dept_postname");
|
|
Set<String> deptPostNameSet = getConfigValueSet("cw_dept_postname");
|
|
|
Set<String> officePostNameSet = getConfigValueSet("cw_office_postname");
|
|
Set<String> officePostNameSet = getConfigValueSet("cw_office_postname");
|
|
@@ -1051,7 +1052,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiyYSLSalesOrgTree();
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiyYSLSalesOrgTree();
|
|
|
userExt.setOrgName(m.getStext5());
|
|
userExt.setOrgName(m.getStext5());
|
|
|
setExtOrgCodeY9(salesTreeMap, 4, userExt);
|
|
setExtOrgCodeY9(salesTreeMap, 4, userExt);
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
}else{
|
|
}else{
|
|
|
userExt.setSalesLevel("ClueReporting_level");
|
|
userExt.setSalesLevel("ClueReporting_level");
|
|
|
userExt.setOrgName("品保中心");
|
|
userExt.setOrgName("品保中心");
|
|
@@ -1163,9 +1164,9 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
Long deptIdsfa = Long.parseLong(configService.selectConfigByKey("libang.user.sfa.deptid"));
|
|
Long deptIdsfa = Long.parseLong(configService.selectConfigByKey("libang.user.sfa.deptid"));
|
|
|
Long roleIdsfa = Long.parseLong(configService.selectConfigByKey("libang.user.sfa.roleid"));
|
|
Long roleIdsfa = Long.parseLong(configService.selectConfigByKey("libang.user.sfa.roleid"));
|
|
|
SysUserExt userExt =user.getSysUserExt();
|
|
SysUserExt userExt =user.getSysUserExt();
|
|
|
|
|
+ if(m.getBusinessUnit().equals("DIY")){
|
|
|
if (sfaPostNameSet.contains(postName)) {
|
|
if (sfaPostNameSet.contains(postName)) {
|
|
|
userExt.setSalesLevel("diysfa_level");
|
|
userExt.setSalesLevel("diysfa_level");
|
|
|
- if(m.getBusinessUnit().equals("DIY")){
|
|
|
|
|
Map<Integer,Map<String,Map<String,String>>> salesTreeMap = getDiySalesOrgTree();
|
|
Map<Integer,Map<String,Map<String,String>>> salesTreeMap = getDiySalesOrgTree();
|
|
|
Set<String> companySet = getConfigValueSet("libang_company_level_postname");
|
|
Set<String> companySet = getConfigValueSet("libang_company_level_postname");
|
|
|
if(companySet.contains(postName)){
|
|
if(companySet.contains(postName)){
|
|
@@ -1184,7 +1185,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
int i = getLevel(userExt,salesTreeMap);
|
|
int i = getLevel(userExt,salesTreeMap);
|
|
|
|
|
|
|
|
}
|
|
}
|
|
|
- }else if(m.getBusinessUnit().equals("CW")){
|
|
|
|
|
|
|
+ }/*else if(m.getBusinessUnit().equals("CW")){
|
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTreeY9();
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiySalesOrgTreeY9();
|
|
|
Set<String> deptPostNameSet = getConfigValueSet("cw_dept_postname");
|
|
Set<String> deptPostNameSet = getConfigValueSet("cw_dept_postname");
|
|
|
Set<String> officePostNameSet = getConfigValueSet("cw_office_postname");
|
|
Set<String> officePostNameSet = getConfigValueSet("cw_office_postname");
|
|
@@ -1207,7 +1208,7 @@ public class AnalysisSysUserService implements IAnalysisSysUserService {
|
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiyYSLSalesOrgTree();
|
|
Map<Integer, Map<String, Map<String, String>>> salesTreeMap = getDiyYSLSalesOrgTree();
|
|
|
userExt.setOrgName(m.getStext5());
|
|
userExt.setOrgName(m.getStext5());
|
|
|
setExtOrgCodeY9(salesTreeMap, 4, userExt);
|
|
setExtOrgCodeY9(salesTreeMap, 4, userExt);
|
|
|
- }
|
|
|
|
|
|
|
+ }*/
|
|
|
|
|
|
|
|
}else{
|
|
}else{
|
|
|
userExt.setSalesLevel("ClueReporting_level");
|
|
userExt.setSalesLevel("ClueReporting_level");
|