更改bug

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/OrganSonServiceService.java

@@ -161,7 +161,7 @@ public class OrganSonServiceService implements IOrganSonService {
             userAccountVo.setUserinfotype(userinfo.getUserinfotype());
             userAccountVo.setContactname(userinfo.getContactname());
             if (userinfo.getDistrictid() != null) {
-                userAccountVo.setPathname(iDivisionMapper.selectAreaPathName(userinfo.getDistrictid()) + userinfo.getAddress());
+                userAccountVo.setPathname(iDivisionMapper.selectAreaPathName(userinfo.getCountryid()) + iDivisionMapper.selectAreaPathName(userinfo.getDistrictid()) + userinfo.getAddress());
             }
         }
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), result);
@@ -438,7 +438,7 @@ public class OrganSonServiceService implements IOrganSonService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult addsonorgan(OrganAddSonOrganParam param, HttpServletRequest request) {
         // #6597 管理端】不管是后台注册还是客户端注册，身份证号填写的那一栏，如果涉及到输入字母X，需要固定只能输入大写字母
-        if (param != null && StringUtils.isNotBlank(param.getCardnum())){
+        if (param != null && StringUtils.isNotBlank(param.getCardnum())) {
             param.setCardnum(param.getCardnum().toUpperCase());
         }
 
@@ -492,7 +492,7 @@ public class OrganSonServiceService implements IOrganSonService {
     @Transactional(rollbackFor = Exception.class)
     public AjaxResult editsonorgan(OrganAddSonOrganParam param, HttpServletRequest request) {
         // #6597 管理端】不管是后台注册还是客户端注册，身份证号填写的那一栏，如果涉及到输入字母X，需要固定只能输入大写字母
-        if (param != null && StringUtils.isNotBlank(param.getCardnum())){
+        if (param != null && StringUtils.isNotBlank(param.getCardnum())) {
             param.setCardnum(param.getCardnum().toUpperCase());
         }
 
@@ -795,7 +795,7 @@ public class OrganSonServiceService implements IOrganSonService {
     public PageResult<UserAccountRspResult> queryOrganSonModify(UserAccountReqParam param, HttpServletRequest request) {
         IPage<UserAccountRspResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<UserAccountRspResult> userAccountVos = iUseraccountMapper.queryOrganSonModify(page, param);
-        userAccountVos.getRecords().forEach(a->{
+        userAccountVos.getRecords().forEach(a -> {
 
         });
         PageResult<UserAccountRspResult> pageResult = new PageResult<>();
@@ -817,10 +817,10 @@ public class OrganSonServiceService implements IOrganSonService {
         }
         IPage<OrganSonTransferResult> page = new Page<>(param.getPageNum(), param.getPageSize());
         IPage<OrganSonTransferResult> userAccountVos = iUseraccountMapper.queryOrganSonTransfer(page, param);
-        userAccountVos.getRecords().forEach(a->{
+        userAccountVos.getRecords().forEach(a -> {
             a.setOutparentusername(iUseraccountMapper.selectOrganName(a.getAreauserid()));
             a.setInuseridname(iUseraccountMapper.selectOrganName(a.getNewareauserid()));
-            if(param.getTransferusertype() == 1){
+            if (param.getTransferusertype() == 1) {
                 a.setOutmemberusername(iUseraccountMapper.selectOrganName(a.getMemberuserid()));
                 a.setOutinvestorname(iUseraccountMapper.selectOrganName(a.getInvestoruserid()));
                 a.setInmemberusername(iUseraccountMapper.selectOrganName(a.getNewmemberuserid()));
@@ -861,8 +861,8 @@ public class OrganSonServiceService implements IOrganSonService {
 
     @Override
     public AjaxResult<OrganSelectResult> querySonOrganPageByLevel(Integer subarealevel, String searchcode, HttpServletRequest request) {
-        List<OrganSelectResult> results = iUseraccountMapper.querySonOrganPageByLevel(subarealevel,searchcode);
-        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"),results);
+        List<OrganSelectResult> results = iUseraccountMapper.querySonOrganPageByLevel(subarealevel, searchcode);
+        return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), results);
     }
 
     @Override
@@ -1275,6 +1275,7 @@ public class OrganSonServiceService implements IOrganSonService {
         UserAccountDetailVo userAccountDetailVo = iUseraccountMapper.selectNewDetail(userid);
         detailResult.setUserAccountDetailVo(userAccountDetailVo);
         UserinfoDetailVo userinfoDetailVo = iUserinfoMapper.getUserinfoNewDetail(userid);
+        userinfoDetailVo.setPathName(userinfoDetailVo.getCountryName()+userinfoDetailVo.getPathName());
         detailResult.setUserinfoDetailVo(userinfoDetailVo);
         return detailResult;
     }
@@ -1284,6 +1285,7 @@ public class OrganSonServiceService implements IOrganSonService {
         UserAccountDetailVo userAccountDetailVo = iUseraccountMapper.selectDetail(userid);
         detailResult.setUserAccountDetailVo(userAccountDetailVo);
         UserinfoDetailVo userinfoDetailVo = iUserinfoMapper.getUserinfoDetail(userid);
+        userinfoDetailVo.setPathName(userinfoDetailVo.getCountryName()+userinfoDetailVo.getPathName());
         detailResult.setUserinfoDetailVo(userinfoDetailVo);
         //开户地址
         if (userAccountDetailVo.getUsertype() != 5) {

mtp3-century/src/main/java/com/muchinfo/mtp3century/service/impl/WskhUserinfoServiceImpl.java

@@ -149,7 +149,7 @@ public class WskhUserinfoServiceImpl extends ServiceImpl<IWskhUserinfoMapper, Ws
         if (wskhUserinfo.getMemberareaid() != null)
             wskhUserinfo.setMemberusername(iUseraccountMapper.selectOrganName(wskhUserinfo.getMemberareaid()));
         if (wskhUserinfo.getDistrictid() != null)
-            wskhUserinfo.setPathname(iDivisionMapper.selectAreaPathName(wskhUserinfo.getDistrictid()) + wskhUserinfo.getCardaddress());
+            wskhUserinfo.setPathname(iDivisionMapper.selectAreaPathName(wskhUserinfo.getCountryid()) + iDivisionMapper.selectAreaPathName(wskhUserinfo.getDistrictid()) + wskhUserinfo.getCardaddress());
         return AjaxResult.success(Constants.Success_Code_Design, MessageType.MESSAGE_CODE_SYSTEM001.getCode(), request.getHeader("Accept-Language"), wskhUserinfo);
     }
 

mtp3-century/src/main/resources/mapper/UserinfoMapper.xml

@@ -106,6 +106,8 @@
         <result column="DISTRICTID" property="districtid" />
         <association property="pathName" column="DISTRICTID"
                      jdbcType="VARCHAR" select="com.muchinfo.mtp3interface.mapper.IDivisionMapper.selectAreaPathName"></association>
+        <association property="countryName" column="COUNTRYID"
+                     jdbcType="VARCHAR" select="com.muchinfo.mtp3interface.mapper.IDivisionMapper.selectAreaPathName"></association>
     </resultMap>
 
     <!-- 通用查询结果列 -->

mtp3-pojos/src/main/java/com/muchinfo/mtp3pojos/vo/investor/UserinfoDetailVo.java

@@ -59,6 +59,8 @@ public class UserinfoDetailVo {
 
     private Long countryid;
 
+    private String countryName;
+
     private Long provinceid;
 
     private Long cityid;