Merge branch 'master-Member-bug-modify' into dev

# Conflicts:
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserDetailMapper.java
#	ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java
#	ace-modules/ace-admin/src/main/resources/mapper/AppUserDetailMapper.xml

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

@@ -43,7 +43,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
     private AppUserLoginMapper appUserLoginMapper;
 
     @Autowired
-    private BaseUserMemberMapper baseUserMemberMapper;
+    private AppUserDetailBiz appUserDetailBiz;
 
     @Autowired
     private VehicleFeign vehicleFeign;
@@ -56,7 +56,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      */
     public PageInfo<AppUserManageVo> findAllByQuery(AppUserManageDTO appUserManageDTO) {
          PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
         PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
         if (pageInfo.getList()==null||pageInfo.getList().size()==0) {
             return  pageInfo;
@@ -85,6 +85,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
                     Long cityCode = Long.valueOf(appUserManageVo.getCityCode());
                     String crtyName = map.get(cityCode);
                     appUserManageVo.setCityName(crtyName);
+
                 }
 
             }
@@ -99,12 +100,10 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
      */
     public PageInfo<AppUserManageVo> findAllByQueryAndCity(AppUserManageDTO appUserManageDTO) {
         PageHelper.startPage(appUserManageDTO.getPage(), appUserManageDTO.getLimit());
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUser(appUserManageDTO);
         if (CollectionUtils.isEmpty(appUserManageVos)) {
             return  new PageInfo<AppUserManageVo>();
         }
-//        Set<Integer> usSet = appUserManageDTO.getCitySet();
-//        List<AppUserManageVo> results = appUserManageVos.parallelStream().filter(us -> usSet.contains(us.getCityCode())).collect(Collectors.toList());
         PageInfo<AppUserManageVo> pageInfo = PageInfo.of(appUserManageVos);
         return getAppUserManageVoPageInfo(pageInfo);
     }
@@ -186,9 +185,7 @@ public class AppUserManageBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
 
     public AppUserManageVo findUserInfoById(Integer userId) {
         AppUserManageVo appUserManageVo = new AppUserManageVo();
-        AppUserManageDTO appUserManageDTO = new AppUserManageDTO();
-        appUserManageDTO.setUserId(userId);
-        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(appUserManageDTO);
+        List<AppUserManageVo> appUserManageVos = mapper.selectAppUserManage(userId);
         if (CollectionUtils.isEmpty(appUserManageVos)){
             return appUserManageVo;
         }

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/mapper/AppUserLoginMapper.java

@@ -3,6 +3,7 @@ package com.github.wxiaoqi.security.admin.mapper;
 import com.github.wxiaoqi.security.admin.bo.UserBo;
 import com.github.wxiaoqi.security.admin.entity.AppUserLogin;
 import com.github.wxiaoqi.security.admin.entity.AppUserManage;
+import com.github.wxiaoqi.security.admin.vo.AppUserManageVo;
 import org.apache.ibatis.annotations.Param;
 import org.apache.ibatis.annotations.Select;
 import org.apache.ibatis.annotations.Update;
@@ -36,4 +37,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
     List<Integer> findAppUser(@Param("phone") String phone,@Param("name") String name,@Param("memberIds") List<Integer> memberIds);
 
     List<UserBo> selectByUserIds(@Param("userIds") List<Integer> uids);
+
+    AppUserManageVo selectByParentId(@Param("parentId") Integer parentId);
 }
\ No newline at end of file

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rest/AppUsersManageController.java

@@ -67,26 +67,10 @@ public class AppUsersManageController extends BaseController<AppUserManageBiz,Ap
     }
 
     /**
-     * 查询所有,获取具体信息
+     * 根据用户id获取用户详情
+     * @param userId
      * @return
      */
-    @PostMapping("/all")
-    public ObjectRestResponse<PageInfo<AppUserManageVo>> getAllAppUsers(@RequestBody AppUserManageDTO appUserManageDTO) throws Exception {
-        String token = userAuthConfig.getToken(request);
-        ObjectRestResponse objectRestResponse = publicController.userinfoByToken(token);
-        User  user  = (User) objectRestResponse.getData();
-        if (user==null){
-            throw new BaseException("User error!");
-        }
-        if (ALL_PERMISSIONS.equals(user.getDataAll())) {
-            return ObjectRestResponse.succ(baseBiz.getAllAppUsers(appUserManageDTO));
-        }
-        ObjectRestResponse<Set<Integer>> setObjectRestResponse = vehicleFeign.corporationCity(user.getDataZone(), user.getDataCompany());
-        Set<Integer> cityList =  setObjectRestResponse.getData();
-        appUserManageDTO.setCitySet(cityList);
-        return  ObjectRestResponse.succ(baseBiz.getAllAppUsersAndCity(appUserManageDTO));
-    }
-
     @GetMapping("/user_info/{id}")
     public ObjectRestResponse<AppUserManageVo> findUserInfo(@PathVariable(value = "id") Integer userId){
          AppUserManageVo appUserManageVo = baseBiz.findUserInfoById(userId);

ace-modules/ace-admin/src/main/resources/mapper/AppUserLoginMapper.xml

@@ -55,4 +55,9 @@
          INNER JOIN
          `app_user_detail` AS `aud` ON aud.userid=aul.id
     </select>
+
+    <select id="selectByParentId" resultType="com.github.wxiaoqi.security.admin.vo.AppUserManageVo">
+       select IFNULL(d.realname, d.nickname) AS nameOfSuperior,l.username AS superiorMobileNumber
+       from app_user_login l left  join  app_user_detail d on  l.id = d.userid where l.isdel=0 and l.id =#{parentId}
+    </select>
 </mapper>
\ No newline at end of file

xx-order/xx-order-server/src/main/java/com/xxfc/platform/order/rest/BackStageOrderController.java

@@ -194,7 +194,7 @@ public class BackStageOrderController extends CommonBaseController implements Us
                     orderPageVO.setMemberName(appUserVo.getMemberName());
                 }
 
-                if (dto.getType() == 1) {
+                if (dto.getType()!= null&&dto.getType() == 1) {
                     String costDetail = orderPageVO.getOrderRentVehicleDetail().getCostDetail();
                     ObjectMapper objectMapper = new ObjectMapper();
                     try {
@@ -247,7 +247,6 @@ public class BackStageOrderController extends CommonBaseController implements Us
                             log.info("获取驾驶人信息失败！");
                             e.printStackTrace();
                         }
-
                     }
 
                 }