修改车辆管理

src/main/java/com/xjrsoft/module/personnel/controller/CarMessageApplyController.java

@@ -75,7 +75,7 @@ public class CarMessageApplyController {
                         .eq(ObjectUtil.isNotNull(dto.getStatus())&&dto.getStatus()!=0, CarMessageApply::getStatus,dto.getStatus())
                         .select(CarMessageApply.class,x -> VoToColumnUtil.fieldsToColumns(CarMessageApplyPageVo.class).contains(x.getProperty()))
                         .select(CarMessageApply::getId)
-                        .leftJoin(XjrUser.class,XjrUser::getId,CarMessageApply::getCreateUserId, ext->ext.selectAs(XjrUser::getUserName, CarMessageApplyPageVo::getUserName).select(XjrUser::getMobile))
+                        .leftJoin(XjrUser.class,XjrUser::getId,CarMessageApply::getUserId, ext->ext.selectAs(XjrUser::getUserName, CarMessageApplyPageVo::getUserName).select(XjrUser::getMobile))
                         .leftJoin(DictionaryDetail.class,DictionaryDetail::getCode,CarMessageApply::getGender, ext->ext.selectAs(DictionaryDetail::getName, CarMessageApplyPageVo::getGender))
                 );
         PageOutput<CarMessageApplyPageVo> pageOutput = ConventPage.getPageOutput(page, CarMessageApplyPageVo.class);
@@ -89,7 +89,7 @@ public class CarMessageApplyController {
         List<CarMessageApplyPageVo> list = carMessageApplyService.selectJoinList(CarMessageApplyPageVo.class,
                 MPJWrappers.<CarMessageApply>lambdaJoin()
                         .orderByDesc(CarMessageApply::getId)
-                        .eq(CarMessageApply::getCreateUserId, StpUtil.getLoginIdAsLong())
+                        .eq(CarMessageApply::getUserId, StpUtil.getLoginIdAsLong())
                         .eq(CarMessageApply::getStatus,1)
                         .select(CarMessageApply::getId)
                         .select(CarMessageApply.class,x -> VoToColumnUtil.fieldsToColumns(CarMessageApplyPageVo.class).contains(x.getProperty())));

src/main/java/com/xjrsoft/module/personnel/entity/CarMessageApply.java

@@ -128,4 +128,9 @@ public class CarMessageApply implements Serializable {
      */
     @ApiModelProperty("续期 (0:未续期 1:已续期)")
     private Integer isContinue;
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
+    private  Long userId;
 }

src/main/java/com/xjrsoft/module/personnel/vo/CarMessageApplyPageVo.java

@@ -121,5 +121,9 @@ public class CarMessageApplyPageVo {
      */
     @ApiModelProperty("手机")
     private  String mobile;
-
+    /**
+     * 用户ID
+     */
+    @ApiModelProperty("用户ID")
+    private  Long userId;
 }