Merge remote-tracking branch 'origin/base-modify' into base-modify

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserManageBiz.java

 package com.github.wxiaoqi.security.admin.biz;
 
-import cn.hutool.core.bean.BeanUtil;
-import com.github.pagehelper.Page;
 import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.github.wxiaoqi.security.admin.dto.AppUserManageDTO;
-import com.github.wxiaoqi.security.admin.entity.*;
-import com.github.wxiaoqi.security.admin.mapper.*;
+import com.github.wxiaoqi.security.admin.entity.AppUserDetail;
+import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
+import com.github.wxiaoqi.security.admin.mapper.AppUserDetailMapper;
+import com.github.wxiaoqi.security.admin.mapper.AppUserLoginMapper;
+import com.github.wxiaoqi.security.admin.mapper.BaseUserMemberMapper;
 import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
-import javafx.print.Collation;
 import lombok.extern.slf4j.Slf4j;
-import org.apache.commons.beanutils.BeanMap;
 import org.apache.commons.beanutils.BeanUtilsBean;
 import org.apache.commons.collections.CollectionUtils;
-import org.apache.commons.collections.MapUtils;
-import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -84,9 +81,12 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
                  map.put(sysRegion.getId(),sysRegion.getName());
             }
             for (AppUserManageVo appUserManageVo : pageInfo.getList()) {
-                Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
-                String crtyName = map.get(cityCode);
-                appUserManageVo.setCityName(crtyName);
+                if(appUserManageVo.getCityCode() != null) {
+                    Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
+                    String crtyName = map.get(cityCode);
+                    appUserManageVo.setCityName(crtyName);
+                }
+
             }
         }
         return pageInfo;