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

amos-boot-system-jxiop/amos-boot-module-hygf-api/src/main/java/com/yeejoin/amos/boot/module/hygf/api/config/UserLimitsAdvice.java

@@ -76,7 +76,7 @@ public class UserLimitsAdvice {
             stdUserEmpower.setFlag(false);
             stdUserEmpower.setDeveloperId(userUnitInformationDto!=null?userUnitInformationDto.getAmosUnitInfoId():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);
             if (org.contains(ROLEFLDEVELOP)  && num<2 ){
                 stdUserEmpower.setUserId(userid);