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

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

@@ -3,12 +3,16 @@ package com.github.wxiaoqi.security.admin.biz;
 import com.ace.cache.annotation.Cache;
 import com.ace.cache.annotation.CacheClear;
 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.rpc.service.AppPermissionService;
 import com.github.wxiaoqi.security.admin.vo.AppUserVo;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.xxfc.platform.im.utils.StringUtil;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.collections.CollectionUtils;
+import org.apache.commons.lang3.StringUtils;
+import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
@@ -32,6 +36,10 @@ import java.util.stream.Collectors;
 public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail> {
 
 
+    @Autowired
+    AppUserLoginBiz userLoginBiz;
+
+
     @Override
     @CacheClear(pre = "user{1.userid}")
     public void updateSelectiveById(AppUserDetail entity) {
@@ -96,6 +104,14 @@ public class AppUserDetailBiz extends BaseBiz<AppUserDetailMapper, AppUserDetail
                 entity.setUpdatetime(Instant.now().toEpochMilli() / 1000L);
                 super.updateSelectiveById(entity);
             }
+            Integer userid=entity.getUserid();
+            AppUserLogin appUserLogin=new AppUserLogin();
+            appUserLogin.setWxOpenid(userVo.getWxOpenid());
+            appUserLogin.setUnionid(userVo.getUnionid());
+            appUserLogin.setOpenid(userVo.getOpenid());
+            appUserLogin.setId(userid);
+            appUserLogin.setUsername(userVo.getUsername());
+            userLoginBiz.bindOpenid(appUserLogin);
         } catch (Exception e) {
             e.printStackTrace();
         }

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

@@ -48,6 +48,11 @@ public class AppUserLoginBiz extends BaseBiz<AppUserLoginMapper, AppUserLogin> {
         super.updateSelectiveById(entity);
     }
 
+    @CacheClear(pre = "user{1.username}")
+    public int bindOpenid(AppUserLogin entity) {
+        return  mapper.bindOpenId(entity);
+    }
+
     @CacheClear(pre = "user{1.username}")
     public void updatePasswordById(AppUserLogin entity) {
         String password = new BCryptPasswordEncoder(UserConstant.PW_ENCORDER_SALT).encode(entity.getPassword());

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

@@ -146,14 +146,14 @@ public class BaseUserMemberBiz extends BaseBiz<BaseUserMemberMapper, BaseUserMem
                 if (freeDays > 0 && freeDays >= days) {
                     freeDays = freeDays - days;
                     baseUserMember.setRentFreeDays(freeDays);
+                    }
                     Integer payCount = userMemberVo.getPayCount() == null ? 0 : userMemberVo.getPayCount();
-                    if (days > 0) {
+                   /* if (days > 0) {
                         payCount = payCount + 1;
-                    }
+                    }*/
                     baseUserMember.setPayCount(payCount);
                     getMyBiz().updateSelectiveById(baseUserMember);
                     num = freeDays;
-                }
             } else if (type == 2) {
                     /*Integer payCount=userMemberVo.getPayCount()==null?0:userMemberVo.getPayCount();
                     payCount=payCount+1;

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

@@ -22,4 +22,6 @@ public interface AppUserLoginMapper extends Mapper<AppUserLogin>, SelectByIdList
     void updateLoginUserInfoById(@Param("userId") Integer userId,@Param("ip") String ip, @Param("lastTime") long lastTime);
 
     List<AppUserLogin> selectbyPhones(@Param("phones") List<String> phones);
+
+   int  bindOpenId(AppUserLogin appUserLogin);
 }
\ No newline at end of file

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

@@ -8,4 +8,8 @@
           #{phone}
         </foreach>
     </select>
+    
+    <update id="bindOpenId" parameterType="com.github.wxiaoqi.security.admin.entity.AppUserLogin">
+        UPDATE  app_user_login SET wx_openid=#{wxOpenid},unionid=#{unionid},openid=#{openid} where  id=#{id}
+    </update>
 </mapper>
\ No newline at end of file

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

@@ -35,6 +35,7 @@ import com.xxfc.platform.universal.entity.Dictionary;
 import com.xxfc.platform.universal.feign.ThirdFeign;
 import com.xxfc.platform.universal.vo.OrderPayVo;
 import com.xxfc.platform.vehicle.common.RestResponse;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.Vehicle;
 import com.xxfc.platform.vehicle.feign.VehicleFeign;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
@@ -60,7 +61,6 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
 import static com.xxfc.platform.universal.constant.DictionaryKey.APP_ORDER;
 
 @Controller
@@ -97,6 +97,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
     @Autowired
     RabbitProduct rabbitProduct;
 
+
     @Override
     public UserFeign getUserFeign() {
         return userFeign;
@@ -182,39 +183,16 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         if(userDTO == null) {
             return ObjectRestResponse.succ(new PageDataVO<>());
         }
-        if(dto.getStartZoneId() == null) { //默认查出所有权限内的数据
-            if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
-                String zoneId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataZone())) {
-                    if(userDTO.getDataZone().contains(",")) {
-                        zoneId = userDTO.getDataZone();
-                    } else {
-                        zoneId = userDTO.getDataZone() + ",";
-                    }
-                } else {
-                    zoneId = userDTO.getZoneId() + ",";
-                }
-                dto.setZoneIds(zoneId.split(","));
-                String companyId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                    if(userDTO.getDataCompany().contains(",")) {
-                        companyId = userDTO.getDataCompany();
-                    } else {
-                        companyId = userDTO.getDataCompany() + ",";
-                    }
-                } else {
-                    companyId = userDTO.getCompanyId() + ",";
-                }
-                dto.setCompanyIds(companyId.split(","));
-            }
-        }
+        List<BranchCompany> branchCompanies = vehicleFeign.companyAll(userDTO.getDataAll(), userDTO.getDataCompany(), userDTO.getDataZone());
+        List<Integer> companyIds = branchCompanies.stream().map(BranchCompany::getId).collect(Collectors.toList());
+        dto.setCompanyIds(companyIds);
         Query query = new Query(dto);
         PageDataVO pageDataVO = PageDataVO.pageInfo(query, () -> baseOrderBiz.listOrder(query.getSuper()));
         List<OrderListVo> list = pageDataVO.getData();
         List<Integer> userIds = list.stream().map(OrderListVo::getUserId).distinct().collect(Collectors.toList());
        if(userIds != null && userIds.size() >0) {
            ObjectRestResponse<List<AppUserVo>> objectRestResponse = userFeign.getByUserIds(userIds);
-           log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getMessage());
+           log.info("获取用户信息：objectRestResponse = {}", objectRestResponse.getData());
            Map<String, AppUserVo> appUserVoMap = objectRestResponse.getData() == null? new HashMap<String, AppUserVo>()
                    : objectRestResponse.getData().parallelStream().collect(Collectors.toMap(v -> v.getUserid().toString(), v -> v));
 
@@ -466,7 +444,6 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         return null;
     }
 
-
     /**
      * 订单查询类
      */
@@ -497,8 +474,7 @@ public class BaseOrderController extends CommonBaseController implements UserRes
         @ApiModelProperty("每页限制")
         Integer limit;
 
-        String[] companyIds;
+        List<Integer> companyIds;
 
-        String[] zoneIds;
     }
 }

xx-order/xx-order-server/src/main/resources/mapper/BaseOrderMapper.xml

@@ -138,7 +138,7 @@
                 and (r.start_time between #{startTime} and #{endTime}
                 or t.start_time between #{startTime} and #{endTime})
             </if>
-            <if test="companyIds != null">
+            <if test="companyIds != null and companyIds.size > 0">
                 and (r.start_company_id in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
@@ -149,7 +149,7 @@
                 </foreach>
                 )
             </if>
-            <if test="zoneIds != null">
+            <if test="zoneIds != null and zoneIds.size > 0">
                 and (r.start_zone_id in
                 <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
                     #{id}

xx-universal/xx-universal-server/src/main/java/com/xxfc/platform/universal/biz/OrderPayBiz.java

 package com.xxfc.platform.universal.biz;
 
-import cn.hutool.core.text.UnicodeUtil;
 import com.alibaba.fastjson.JSON;
 import com.alibaba.fastjson.JSONObject;
 import com.alipay.api.AlipayApiException;
@@ -280,7 +279,7 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         //实例化客户端
         AlipayClient alipayClient = new DefaultAlipayClient(SystemConfig.ALIPAY_PAY_BASE_URL + "/gateway.do",
                 SystemConfig.ALIPAY_APPID, SystemConfig.ALIPAY_PRIVATE_KEY, AlipayConstants.FORMAT_JSON,
-                AlipayConstants.CHARSET_UTF8, SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.SIGN_TYPE_RSA2);
+                "UTF-8", SystemConfig.ALIPAY_PUBLIC_KEY, AlipayConstants.SIGN_TYPE_RSA2);
         orderPayVo.setNotifyUrl(notifyUrl);
         try {
             if (orderPayVo.getPayWay() == 2) { //支付宝APP支付
@@ -301,31 +300,25 @@ public class OrderPayBiz extends BaseBiz<OrderPayMapper, OrderPay> {
         BigDecimal realAmount = new BigDecimal(orderPayVo.getAmount().toString()).divide(new BigDecimal("100"), 2, BigDecimal.ROUND_UP);
         AlipayTradeAppPayRequest request = new AlipayTradeAppPayRequest();
         //SDK已经封装掉了公共参数，这里只需要传入业务参数。以下方法为sdk的model入参方式(model和biz_content同时存在的情况下取biz_content)。
-
-        try {
-            //这里和普通的接口调用不同，使用的是sdkExecute
 //        request.setBizContent("{" +
-//                    "\"timeout_express\":\"30m\"," +
-//                    "\"product_code\":\"QUICK_MSECURITY_PAY\"," +
 //                "\"total_amount\":\"" + realAmount.toString() + "\"," +
 //                "\"subject\":\"" + orderPayVo.getSubject() + "\"," +
 //                "\"body\":\"" + orderPayVo.getBody() + "\"," +
 //                "\"out_trade_no\":\"" + orderPayVo.getTradeNo() + "\"" +
-//                    "}");
-            AlipayTradeAppPayModel model = new AlipayTradeAppPayModel();
-            //model.setBody("我是测试数据");
-            model.setSubject(orderPayVo.getSubject());
-            model.setOutTradeNo(orderPayVo.getTradeNo());
-            model.setTimeoutExpress("30m");
-            model.setTotalAmount(realAmount.toString());
-            model.setProductCode("QUICK_MSECURITY_PAY");
-            request.setBizModel(model);
+//                "  }");
+        request.setBizContent("{" +
+                "\"total_amount\":\"0.01\"," +
+                "\"subject\":\"大乐透\"," +
+                "\"out_trade_no\":\"70501111111S001111119\"" +
+                "  }");
         request.setNotifyUrl(orderPayVo.getNotifyUrl());
-            log.info("请求参数：param = {}", request.getBizModel().toString());
+        log.info("请求参数：param = {}", request.getBizContent());
+        try {
+            //这里和普通的接口调用不同，使用的是sdkExecute
             AlipayTradeAppPayResponse response = alipayClient.sdkExecute(request);
-            log.info(UnicodeUtil.toUnicode(response.getBody()));//就是orderString 可以直接给客户端请求，无需再做处理。
-            return UnicodeUtil.toUnicode(response.getBody());
-        } catch (Exception e) {
+            log.info(response.getBody());//就是orderString 可以直接给客户端请求，无需再做处理。
+            return response.getBody();
+        } catch (AlipayApiException e) {
             e.printStackTrace();
         }
         return null;

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

@@ -46,11 +46,9 @@ public class VehicleBookRecordQueryVo extends PageParam {
      */
     private Integer bookType;
 
-    private Integer zoneId;
     private Integer companyId;
-    private List<String> zoneIds;
 
-    private List<String> companyIds;
+    private List<Integer> companyIds;
     private String upkeepIds;
     private Integer userCompany;
 }
\ No newline at end of file

xx-vehicle/xx-vehicle-api/src/main/java/com/xxfc/platform/vehicle/pojo/dto/VehiclePlanDto.java

@@ -33,7 +33,6 @@ public class VehiclePlanDto extends PageParam {
     @ApiModelProperty(value = "所属分公司大区")
     private Integer zoneId;
 
-    private List<String> companyIds;
+    private List<Integer> companyIds;
 
-    private List<String> zoneIds;
 }

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

@@ -9,6 +9,7 @@ import com.github.wxiaoqi.security.admin.feign.UserFeign;
 import com.github.wxiaoqi.security.admin.feign.dto.UserDTO;
 import com.github.wxiaoqi.security.admin.feign.rest.UserRestInterface;
 import com.github.wxiaoqi.security.common.biz.BaseBiz;
+import com.github.wxiaoqi.security.common.vo.PageDataVO;
 import com.google.common.collect.Lists;
 import com.xxfc.platform.vehicle.common.RestResponse;
 import com.xxfc.platform.vehicle.constant.RedisKey;
@@ -16,11 +17,10 @@ import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.BranchCompanyStockInfo;
 import com.xxfc.platform.vehicle.entity.SysRegion;
 import com.xxfc.platform.vehicle.mapper.BranchCompanyMapper;
-import com.xxfc.platform.vehicle.util.excel.ExcelImport;
 import com.xxfc.platform.vehicle.pojo.BranchCompanyVo;
 import com.xxfc.platform.vehicle.pojo.CompanyDetail;
 import com.xxfc.platform.vehicle.pojo.CompanySearchDTO;
-import com.github.wxiaoqi.security.common.vo.PageDataVO;
+import com.xxfc.platform.vehicle.util.excel.ExcelImport;
 import lombok.extern.slf4j.Slf4j;
 import org.apache.commons.collections.CollectionUtils;
 import org.apache.commons.collections4.map.HashedMap;
@@ -44,7 +44,8 @@ import java.util.concurrent.TimeUnit;
 import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
-import static com.xxfc.platform.vehicle.constant.DbColumnConstant.*;
+import static com.xxfc.platform.vehicle.constant.DbColumnConstant.COMPANY_ZONE_ID;
+import static com.xxfc.platform.vehicle.constant.DbColumnConstant.ID;
 import static com.xxfc.platform.vehicle.constant.RedisKey.BRANCH_COMPANY_CACHE_DATAZONE;
 
 @Service
@@ -92,37 +93,11 @@ public class BranchCompanyBiz extends BaseBiz<BranchCompanyMapper, BranchCompany
         }
         Map<String, Object> map = new HashedMap<>();
         map.put("zoneId", zoneId);
-        String ids = null;
+        List<Integer> branchCompanies = Lists.newArrayList();
         if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
-            if(StringUtils.isNotBlank(userDTO.getDataZone())) { //获取权限大区ID
-                if(userDTO.getDataZone().contains(",")) {
-                    ids = userDTO.getDataZone();
-                } else {
-                    ids = userDTO.getDataZone() + ",";
-                }
-
-            } else {
-                ids = userDTO.getZoneId() + ",";
-            }
-            String companyId = null;
-            if(Arrays.asList(ids.split(",")).contains(zoneId+"")) {//获取权限公司
-                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                    if(userDTO.getDataCompany().contains(",")) {
-                        companyId = userDTO.getDataCompany();
-                    } else  {
-                        companyId = userDTO.getDataCompany() + ",";
-                    }
-                } else {
-                    companyId = userDTO.getCompanyId() + ",";
-                }
-                map.put("ids", companyId.split(","));
-                List<BranchCompany> list = mapper.selectByZoneId(map);   //查询对应大区和公司的数据
-                return list;
-            } else {
-                return null;
-            }
+            branchCompanies = vehicleBiz.dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
         }
-        map.put("ids", null);
+        map.put("ids", branchCompanies);
         return mapper.selectByZoneId(map);
     }
 

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

@@ -1277,34 +1277,14 @@ public class VehicleBiz extends BaseBiz<VehicleMapper, Vehicle> implements UserR
         if(userDTO == null) {
             return ObjectRestResponse.createFailedResult(235, "token失效");
         }
-        List<String> zoneList = null;
-        List<String> companyList = null;
-        if(vehiclePlanDto.getZoneId() == null) { //默认查出所有权限内的数据
+        List<Integer> companyList =  Lists.newArrayList();
         if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
-                String zoneId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataZone())) {
-                        zoneId = userDTO.getDataZone();
-                } else {
-                    zoneId = userDTO.getZoneId() + ",";
-                }
-                zoneList = new ArrayList<>(Arrays.asList(zoneId.split(",")));
-                String companyId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                        companyId = userDTO.getDataCompany();
-                } else {
-                    companyId = userDTO.getCompanyId() + ",";
-                }
-                companyList = new ArrayList<>(Arrays.asList(companyId.split(",")));
-            }
+            companyList = dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
         }
         if(vehiclePlanDto.getParkBranchCompanyId() != null) {
-            if (companyList == null) {
-                companyList = Lists.newArrayList();
-            }
-            companyList.add(vehiclePlanDto.getParkBranchCompanyId() + "");
+            companyList.add(vehiclePlanDto.getParkBranchCompanyId());
         }
         vehiclePlanDto.setCompanyIds(companyList);
-        vehiclePlanDto.setZoneIds(zoneList);
         Query query = new Query(vehiclePlanDto);
         PageDataVO<VehicleAndModelInfoVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getVehicle(query.getSuper()));
         return ObjectRestResponse.succ(pageDataVO);

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

@@ -18,6 +18,7 @@ import com.xxfc.platform.vehicle.constant.RedisKey;
 import com.xxfc.platform.vehicle.constant.ResCode.ResCode;
 import com.xxfc.platform.vehicle.constant.VehicleBookRecordStatus;
 import com.xxfc.platform.vehicle.entity.BookRecordAccItem;
+import com.xxfc.platform.vehicle.entity.BranchCompany;
 import com.xxfc.platform.vehicle.entity.VehicleBookRecord;
 import com.xxfc.platform.vehicle.mapper.BookRecordAccItemMapper;
 import com.xxfc.platform.vehicle.mapper.VehicleBookRecordMapper;
@@ -38,11 +39,11 @@ import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import tk.mybatis.mapper.entity.Example;
 
-import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
+import java.util.stream.Collectors;
 
 import static com.github.wxiaoqi.security.auth.common.constatns.CommonConstants.DATA_ALL_FALSE;
 
@@ -64,6 +65,9 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     @Autowired
     private BookRecordAccItemMapper bookRecordAccItemMapper;
 
+    @Autowired
+    BranchCompanyBiz branchCompanyBiz;
+
     @Autowired
     UserFeign userFeign;
 
@@ -105,37 +109,14 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
         if(userDTO == null) {
             return RestResponse.codeAndMessage(235, "token失效");
         }
-        vehicleBookRecordQueryVo.setUserCompany(userDTO.getCompanyId());
-        if(vehicleBookRecordQueryVo.getZoneId() == null) { //默认查出所有权限内的数据
+        List<Integer> companyList =  Lists.newArrayList();
         if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
-                String zoneId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataZone())) {
-                    if(userDTO.getDataZone().contains(",")) {
-                        zoneId = userDTO.getDataZone();
-                    } else {
-                        zoneId = userDTO.getDataZone() + ",";
-                    }
-                } else {
-                    zoneId = userDTO.getZoneId() + ",";
-                }
-                vehicleBookRecordQueryVo.setZoneIds(Arrays.asList(zoneId.split(",")));
-                String companyId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                    if(userDTO.getDataCompany().contains(",")) {
-                        companyId = userDTO.getDataCompany();
-                    } else {
-                        companyId = userDTO.getDataCompany() + ",";
-                    }
-                } else {
-                    companyId = userDTO.getCompanyId() + ",";
-                }
-                vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList(companyId.split(",")));
-            }
-        } else {
-            vehicleBookRecordQueryVo.setZoneIds(Arrays.asList((vehicleBookRecordQueryVo.getZoneId() + ",").split(",")));
-            vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList((vehicleBookRecordQueryVo.getLiftCompany() + ",").split(",")));
-        }
-        vehicleBookRecordQueryVo.getCompanyIds().add(vehicleBookRecordQueryVo.getCompanyId() + "");
+            companyList = dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
+        }
+        if(vehicleBookRecordQueryVo.getUserCompany() != null) {
+            companyList.add(vehicleBookRecordQueryVo.getUserCompany());
+        }
+        vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         return RestResponse.suc(pageDataVO);
@@ -152,41 +133,14 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
             return RestResponse.codeAndMessage(235, "token失效");
         }
         vehicleBookRecordQueryVo.setUserCompany(userDTO.getCompanyId());
-        if(vehicleBookRecordQueryVo.getZoneId() == null) { //默认查出所有权限内的数据
+        List<Integer> companyList =  Lists.newArrayList();
         if(DATA_ALL_FALSE.equals(userDTO.getDataAll())) { //不能获取全部数据
-                String zoneId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataZone())) {
-                    if(userDTO.getDataZone().contains(",")) {
-                        zoneId = userDTO.getDataZone();
-                    } else {
-                        zoneId = userDTO.getDataZone() + ",";
-                    }
-                } else {
-                    zoneId = userDTO.getZoneId() + ",";
-                }
-                vehicleBookRecordQueryVo.setZoneIds(Arrays.asList(zoneId.split(",")));
-                String companyId = null;
-                if(StringUtils.isNotBlank(userDTO.getDataCompany())) {
-                    if(userDTO.getDataCompany().contains(",")) {
-                        companyId = userDTO.getDataCompany();
-                    } else {
-                        companyId = userDTO.getDataCompany() + ",";
-                    }
-                } else {
-                    companyId = userDTO.getCompanyId() + ",";
-                }
-                vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList(companyId.split(",")));
-            }
-        } else {
-            vehicleBookRecordQueryVo.setZoneIds(Arrays.asList((vehicleBookRecordQueryVo.getZoneId() + ",").split(",")));
-            vehicleBookRecordQueryVo.setCompanyIds(Arrays.asList((vehicleBookRecordQueryVo.getLiftCompany() + ",").split(",")));
+            companyList = dataCompany(userDTO.getDataZone(), userDTO.getDataCompany());
         }
         if(vehicleBookRecordQueryVo.getCompanyId() != null) {
-            if(vehicleBookRecordQueryVo.getCompanyIds() == null) {
-                vehicleBookRecordQueryVo.setCompanyIds(new ArrayList<>());
-            }
-            vehicleBookRecordQueryVo.getCompanyIds().add(vehicleBookRecordQueryVo.getCompanyId() + "");
+            companyList.add(vehicleBookRecordQueryVo.getCompanyId());
         }
+        vehicleBookRecordQueryVo.setCompanyIds(companyList);
         Query query = new Query(vehicleBookRecordQueryVo);
         PageDataVO<VehicleBookRecordVo> pageDataVO = PageDataVO.pageInfo(query, () -> mapper.getBookRecordInfo(query.getSuper()));
         return RestResponse.suc(pageDataVO);
@@ -493,6 +447,16 @@ public class VehicleBookRecordBiz extends BaseBiz<VehicleBookRecordMapper, Vehic
     private void createAccItemTbIfNotExists(String tbName){
         bookRecordAccItemMapper.createTbIfNotExists(tbName);
     }
-
+    public List<Integer> dataCompany(String dataZone, String dataCompany) {
+        List<BranchCompany> zoneCompanys = branchCompanyBiz.dataCompany(dataZone);
+        //((VehicleBiz)AopContext.currentProxy()).dataCompany(dataZone);
+        List<Integer> zoneCompanyIds = zoneCompanys.parallelStream().map(BranchCompany::getId).collect(Collectors.toList());
+        if(StringUtils.isNotBlank(dataCompany)) {
+            List<Integer> dataCompanyIds = Arrays.asList(dataCompany.split(",")).parallelStream().map(s -> Integer.valueOf(s)).collect(Collectors.toList());
+            zoneCompanyIds.addAll(dataCompanyIds);
+        }
+        //去重
+        return zoneCompanyIds.parallelStream().distinct().collect(Collectors.toList());
+    }
 
 }

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

@@ -42,7 +42,7 @@
     <select id="selectByZoneId" parameterType="java.util.Map" resultType="com.xxfc.platform.vehicle.entity.BranchCompany">
         select * from branch_company
         where zone_id = #{zoneId}
-        <if test="ids != null">
+        <if test="ids != null and ids.size > 0">
             and  id in
             <foreach collection="ids" item="id" open="(" separator="," close=")">
               #{id}

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

@@ -387,7 +387,7 @@
             LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
         <where>
             <if test="selectedMonth != null">
-                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_start_date like CONCAT(#{selectedMonth}, "%"))
+                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
@@ -395,19 +395,13 @@
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
-            <if test="companyIds != null">
+            <if test="companyIds != null and companyIds.size > 0">
                 and v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
                 </foreach>
 
             </if>
-            <if test="zoneIds != null">
-                and bc1.zone_id in
-                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
             and v1.status between  1 and 2
         </where>
 
@@ -425,7 +419,7 @@
         LEFT JOIN branch_company bc4 on v3.subordinate_branch = bc4.id
         <where>
             <if test="selectedMonth != null">
-                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_start_date like CONCAT(#{selectedMonth}, "%"))
+                and (v1.book_start_date like CONCAT(#{selectedMonth}, "%") or v1.book_end_date like CONCAT(#{selectedMonth}, "%"))
             </if>
             <if test="numberPlate != null">
                 and v3.number_plate = #{numberPlate}
@@ -433,7 +427,7 @@
             <if test="bookType != null">
                 and v1.book_type = #{bookType}
             </if>
-            <if test="companyIds != null">
+            <if test="companyIds != null and companyIds.size > 0">
                 and (v1.lift_company in
                 <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                     #{id}
@@ -443,12 +437,6 @@
                     #{id}
                 </foreach>)
             </if>
-            <if test="zoneIds != null">
-                and bc1.zone_id in
-                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
-                    #{id}
-                </foreach>
-            </if>
             <if test="status != null">
                 and v1.status = #{status}
             </if>

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

@@ -227,13 +227,13 @@
                     </foreach>
                 </trim>
                 )
-                or v.expect_destination_branch_company_id in (
+                <!--or v.expect_destination_branch_company_id in (
                 <trim suffixOverrides=",">
                     <foreach collection="companyList" item="companyId">
                         #{companyId},
                     </foreach>
                 </trim>
-                )
+                )-->
     <!--            or v.subordinate_branch in (-->
     <!--            <trim suffixOverrides=",">-->
     <!--                <foreach collection="companyList" item="companyId">-->
@@ -463,13 +463,13 @@
            <if test="numberPlate != null">
                and v1.number_plate = #{numberPlate}
            </if>
-           <if test="companyIds != null">
+           <if test="companyIds != null and companyIds.size > 0">
                and v1.park_branch_company_id in
                <foreach collection="companyIds" item="id" open="(" separator="," close=")">
                    #{id}
                </foreach>
            </if>
-           <if test="zoneIds != null">
+           <if test="zoneIds != null and zoneIds.size > 0">
                and bc3.zone_id in
                <foreach collection="zoneIds" item="id" open="(" separator="," close=")">
                    #{id}