Merge remote-tracking branch 'origin/dev_ic_platform' into develop

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/AgencyServiceImpl.java

@@ -582,8 +582,8 @@ public class AgencyServiceImpl implements AgencyService {
             if (null == staffInfo){
                 return result;
             }
-            formDTO.setOrgId(staffInfo.getFromOrgId());
+            formDTO.setOrgId(staffInfo.getAgencyId());
-            formDTO.setLevel(staffInfo.getFromOrgType());
+            formDTO.setLevel(OrgInfoConstant.AGENCY);
         }
         if (formDTO.getLevel().equals(OrgInfoConstant.AGENCY)){
             CustomerAgencyEntity entity = customerAgencyDao.selectById(formDTO.getOrgId());