Merge branch 'features/mo' of http://git.quantgroup.cn/QG/cash-loan-flow-boss into features/mo

src/main/java/cn/quantgroup/cashloanflowboss/api/channel/util/ChannelConfUtil.java

@@ -233,7 +233,7 @@ public class ChannelConfUtil {
             channelConfBaseModel.setEnv("");
             channelConfBaseModel.setFundId(0);
             channelConfBaseModel.setP2pFundId(0);
-            if(channelConfiguration.getXyqbProductId() != null){
+            if(StringUtils.isNotEmpty(channelConfiguration.getXyqbProductId())){
                 channelConfBaseModel.setBizType(Integer.valueOf(channelConfiguration.getXyqbProductId()));
             }
             channelConfBaseModel.setAesKey(channelConfiguration.getAesKey());

src/main/java/cn/quantgroup/cashloanflowboss/api/order/service/OrderServiceImpl.java

@@ -629,7 +629,9 @@ public class OrderServiceImpl implements OrderService {
         }
 
         RepaymentPlansResultModel repaymentPlansVo = serviceResult.getData();
-        repaymentPlansVo.setLoanId(loanId);
+        if(Objects.nonNull(repaymentPlansVo)){
+            repaymentPlansVo.setLoanId(loanId);
+        }
         log.info("[findRepaymentPlan] 查询还款计划，返回信息 channelOrderNumber={},loanId={},repaymentPlansVo={}", channelOrderNumber, loanId, repaymentPlansVo);
         return repaymentPlansVo;
     }

src/main/java/cn/quantgroup/cashloanflowboss/core/configuration/ApplicationSecurityHandler.java

@@ -65,7 +65,7 @@ public class ApplicationSecurityHandler implements SecurityHandler {
         if (hasPrivilege) {
             return new Tuple<>(Boolean.TRUE, null);
         } else {
-            log.info("权限不足,userName={},authorityId={}" + principal.getUserInfo().getUsername(), authorityId);
+            log.info("权限不足,userName={},authorityId={}" ,principal.getUserInfo().getUsername(), authorityId);
             return new Tuple<>(Boolean.FALSE, ApplicationStatus.INVALID_AUTHORITY);
         }