Commit 9688067c authored by chenzhao's avatar chenzhao

Merge remote-tracking branch 'origin/dev0124' into dev0124

parents ce13085f 63c69c4d
...@@ -76,7 +76,7 @@ public class UserLimitsAdvice { ...@@ -76,7 +76,7 @@ public class UserLimitsAdvice {
stdUserEmpower.setFlag(false); stdUserEmpower.setFlag(false);
stdUserEmpower.setDeveloperId(userUnitInformationDto!=null?userUnitInformationDto.getAmosUnitInfoId():null); stdUserEmpower.setDeveloperId(userUnitInformationDto!=null?userUnitInformationDto.getAmosUnitInfoId():null);
stdUserEmpower.setRegionalCompaniesCode(userUnitInformationDto!=null?userUnitInformationDto.getRegionalCompaniesCode():null); stdUserEmpower.setRegionalCompaniesCode(userUnitInformationDto!=null?userUnitInformationDto.getRegionalCompaniesCode():null);
stdUserEmpower.setAmosOrgCode(Arrays.asList(userUnitInformationDto.getAmosUnitOrgCode())); stdUserEmpower.setAmosOrgCode(Arrays.asList(userUnitInformationDto.getAmosDealerOrgCode()));
int num = StringUtils.countMatches(org, ROLEFLAG); int num = StringUtils.countMatches(org, ROLEFLAG);
if (org.contains(ROLEFLDEVELOP) && num<2 ){ if (org.contains(ROLEFLDEVELOP) && num<2 ){
stdUserEmpower.setUserId(userid); stdUserEmpower.setUserId(userid);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment