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

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/rpc/service/AppPermissionService.java

@@ -750,7 +750,7 @@ public class AppPermissionService {
     }
 
     //实名认证
-    @Transactional
+
     public ObjectRestResponse upAuthentication(Integer userid, String name, String idNumber, Integer status) {
         log.error("userid====" + userid + "-----name====" + name + "----idNumber===" + idNumber + "---status===" + status);
         if (userid == null || userid == 0 || (status == 1 && StringUtils.isBlank(idNumber) && StringUtils.isBlank(name))) {

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

@@ -239,14 +239,13 @@ public class BaseOrderController extends CommonBaseController implements UserRes
                     List<Integer> tourUserIds = Arrays.asList(orderPageVO.getOrderTourDetail().getTourUserIds().split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
                     ObjectRestResponse<List<AppUserVo>> users = userFeign.getByUserIds(tourUserIds);
                     if (users.getData() != null) {
-                        orderPageVO.getOrderTourDetail().setUserVoList(users.getData() == null? users.getData() : null);
+                        orderPageVO.getOrderTourDetail().setUserVoList(users.getData() == null? users.getData() : new ArrayList<>());
                     }
                 }
 
 
             }
         }
-
         return new ObjectRestResponse<>().data(pageDataVO);
     }
 

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/service/CertificationService.java

@@ -415,6 +415,7 @@ public class CertificationService {
                 idInformation.setUpdTime(new Date());
                 idInformationMapper.updateByPrimaryKeySelective(idInformation);
             }
+            log.info("----addIdInformation---userid==="+idInformation.getUserLonginId()+"----name====" + idInformation.getName()+"---IdNumber==="+idInformation.getIdNumber());
             //认证成功后修改用户,用户认证状态
             ObjectRestResponse authentication = userFeign.authentication(idInformation.getUserLonginId(), idInformation.getName(), idInformation.getIdNumber(), 1);
            return ObjectRestResponse.succ(idInformation.getId());