Merge remote-tracking branch 'origin/dev' into jrz_dev

ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/ServiceAuthRestInterceptor.java

@@ -32,7 +32,7 @@ public class ServiceAuthRestInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if (handler instanceof HandlerMethod) {
+//        if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             // 配置该注解，说明不进行服务拦截
             IgnoreClientToken annotation = handlerMethod.getBeanType().getAnnotation(IgnoreClientToken.class);
@@ -52,8 +52,8 @@ public class ServiceAuthRestInterceptor extends HandlerInterceptorAdapter {
                 }
             }
             throw new ClientForbiddenException("Client is Forbidden!");
-        } else {
-            return super.preHandle(request, response, handler);
-        }
+//        } else {
+//            return super.preHandle(request, response, handler);
+//        }
     }
 }

ace-auth/ace-auth-client/src/main/java/com/github/wxiaoqi/security/auth/client/interceptor/UserAuthRestInterceptor.java

@@ -31,7 +31,7 @@ public class UserAuthRestInterceptor extends HandlerInterceptorAdapter {
 
     @Override
     public boolean preHandle(HttpServletRequest request, HttpServletResponse response, Object handler) throws Exception {
-        if (handler instanceof HandlerMethod) {
+//        if (handler instanceof HandlerMethod) {
             HandlerMethod handlerMethod = (HandlerMethod) handler;
             // 配置该注解，说明不进行用户拦截
             IgnoreUserToken annotation = handlerMethod.getBeanType().getAnnotation(IgnoreUserToken.class);
@@ -64,9 +64,9 @@ public class UserAuthRestInterceptor extends HandlerInterceptorAdapter {
             BaseContextHandler.setToken(token);
             // 这里可以添加RequestType
             return super.preHandle(request, response, handler);
-        }else {
-            return super.preHandle(request, response, handler);
-        }
+//        }else {
+//            return super.preHandle(request, response, handler);
+//        }
     }
 
     @Override

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/entity/BranchCompany.java

@@ -150,7 +150,11 @@ public class BranchCompany {
      * 上下架:1-上架；2-下架
      */
     private Integer state;
-
+    /**
+     * 是否app展示：1-是；2-否
+     */
+    @Column(name = "is_show")
+    private Integer isShow;
 
     /**
      * 是否删除：0-正常；1-删除

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/vo/CompanyVo.java

@@ -55,6 +55,8 @@ public class CompanyVo extends PageParam {
     String addrDetail;
     @ApiModelProperty("上下架:1-上架；2-下架")
     Integer state;
+    @ApiModelProperty("是否app展示：1-是；2-否")
+    Integer isShow;
     @ApiModelProperty("负责人")
     private String leader;
     @ApiModelProperty("负责人联系方式")

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/biz/BranchCompanyStockApplyInfoBiz.java

@@ -46,6 +46,7 @@ public class BranchCompanyStockApplyInfoBiz extends BaseBiz<BranchCompanyStockAp
         BeanUtils.copyProperties(applyVo, applyInfo);
         applyInfo.setState(BranchCompanyStockApplyState.Apply.getCode());
         applyInfo.setCreateTime(new Date());
+        applyInfo.setCompanyId(applyVo.getStockRightId());
         mapper.insertSelective(applyInfo);
 
     }

xx-vehicle/xx-vehicle-server/src/main/resources/mapper/CompanyBaseMapper.xml

@@ -9,6 +9,7 @@
       c.addr_detail as addrDetail,
       c.state,
       c.status,
+      c.is_show as isShow,
       c.leader,
       c.leader_contact_info as leaderContactInfo,
       c.latitude,