Merge branch 'master-bug' into dev

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

@@ -127,6 +127,9 @@
                 </foreach>
 
             </if>
+            <if test="userId != null">
+                and b.user_id = #{userId}
+            </if>
             <if test="status != null">
                 and b.status = #{status}
             </if>

xx-vehicle/xx-vehicle-server/src/main/java/com/xxfc/platform/vehicle/rest/VehicleModelController.java

@@ -10,6 +10,7 @@ import com.github.wxiaoqi.security.auth.client.config.UserAuthConfig;
 import com.github.wxiaoqi.security.common.exception.BaseException;
 import com.github.wxiaoqi.security.common.msg.ObjectRestResponse;
 import com.github.wxiaoqi.security.common.rest.BaseController;
+import com.github.wxiaoqi.security.common.util.ClientUtil;
 import com.github.wxiaoqi.security.common.util.process.ResultCode;
 import com.github.wxiaoqi.security.common.vo.GoodDataVO;
 import com.github.wxiaoqi.security.common.vo.PageDataVO;
@@ -32,8 +33,6 @@ import org.springframework.transaction.interceptor.TransactionAspectSupport;
 import org.springframework.web.bind.annotation.*;
 import tk.mybatis.mapper.entity.Example;
 import tk.mybatis.mapper.weekend.WeekendSqls;
-import tk.mybatis.mapper.entity.Example;
-import tk.mybatis.mapper.weekend.WeekendSqls;
 
 import javax.servlet.http.HttpServletRequest;
 import java.math.BigDecimal;
@@ -295,11 +294,10 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
     }
 
 
-    @Override
     @ApiOperation("删除")
     @DeleteMapping(value = "/app/{id}")
     @Transactional
-    public ObjectRestResponse<VehicleModel> remove(@PathVariable int id) {
+    public ObjectRestResponse<VehicleModel> remove(@PathVariable int id,UserDTO userDTO) {
 
         if (id == 1 || id == 14) {
             return ObjectRestResponse.createFailedResult(ResultCode.FAILED_CODE, "The label cannot be deleted");
@@ -308,7 +306,12 @@ public class VehicleModelController extends BaseController<VehicleModelBiz, Vehi
         VehicleModel vm = new VehicleModel();
         vm.setId(id);
         vm.setIsdel(1);
-        vehicleModelBiz.updateSelectiveById(vm);
+        vm.setUpdTime(new Date());
+        vm.setUpdUser(userDTO.getId());
+        vm.setUpdName(userDTO.getUsername());
+        vm.setUpdHost(org.apache.commons.lang3.StringUtils.defaultIfBlank(request.getHeader("userHost"), ClientUtil.getClientIp(request)));
+//        vehicleModelBiz.updateSelectiveById(vm);
+        vehicleModelBiz.updateByPrimaryKeySelective(vm);
 
         //3.删除车型对应的标签
         VehicleCata vehicleCata = new VehicleCata();