Merge remote-tracking branch 'origin/dev_20260131' into dev_20260131

sckw-auth/src/main/java/com/sckw/auth/model/vo/res/LoginResVo1.java

@@ -152,6 +152,11 @@ public class LoginResVo1 implements Serializable {
     @Schema(description = "岗位角色id")
     private Long roleId;
 
+    /**
+     * 司机id
+     */
+    @Schema(description = "司机id")
+    private Long driverId;
     @Schema(description = "岗位角色列表")
     private List<RoleInfoDto> roleList;
 

sckw-auth/src/main/java/com/sckw/auth/service/impl/AuthServiceImpl.java

@@ -258,6 +258,7 @@ public class AuthServiceImpl implements IAuthService {
         loginRes.setRefreshToken(refreshToken);
         loginRes.setDeptId(user.getDeptId());
         loginRes.setRoleId(user.getRoleId());
+        loginRes.setDriverId(user.getDriverId());
         loginRes.setRoleName(user.getRoleName());
         loginRes.setRoleList(user.getRoleInfoDto());
         List<LoginResVo1.TabBarItem> tabBar = buildAppTabBar(loginBase, user.getRoleName(),0);

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/req/KwsUserReqDto.java

@@ -63,4 +63,9 @@ public class KwsUserReqDto extends BaseModel {
      */
     private String salt;
 
+    /**
+     * 司机id
+     */
+    private Long driverId;
+
 }

sckw-modules-api/sckw-system-api/src/main/java/com/sckw/system/api/model/dto/res/KwsUserResDto.java

@@ -135,5 +135,5 @@ public class KwsUserResDto implements Serializable {
     @JsonSerialize(using = LongToStringUtils.class)
     private Long roleId;
     private List<RoleInfoDto> roleInfoDto;
-
+    private Long driverId;
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/dto/KwfDriverDto.java

@@ -17,6 +17,8 @@ public class KwfDriverDto {
      */
     private String id;
 
+    private Long driverId;
+
     /**
      * 司机名称
      */

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/model/request/TruckDetailParam.java

@@ -21,9 +21,14 @@ public class TruckDetailParam implements Serializable {
     /**
      * 车辆主键id
      */
-    @NotNull(message = "车辆id不能为空")
     @Schema(description = "车辆主键id")
     private Long id;
 
+    /**
+     * 车牌号
+     */
+    @Schema(description = "车牌号")
+    private String truckNo;
+
 
 }

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfDriverService.java

@@ -513,6 +513,7 @@ public class KwfDriverService {
         /**车队班组绑定**/
         requireBizSuccess(driverFleetEdit(driver.getId(), params.getFleetId()), "车队班组绑定");
         //同步信息到员工列表（system 服务，参与同一全局事务）
+        params.setDriverId(driver.getId());
         userEdit(params);
         return HttpResult.ok(result.getMsg(), driver);
     }
@@ -553,6 +554,7 @@ public class KwfDriverService {
         kwsUserReqDto.setUpdateBy(LoginUserHolder.getUserId());
         kwsUserReqDto.setUpdateTime(date);
         kwsUserReqDto.setDelFlag(0);
+        kwsUserReqDto.setDriverId(params.getDriverId());
         remoteUserService.saveUser(kwsUserReqDto);
     }
 

sckw-modules/sckw-fleet/src/main/java/com/sckw/fleet/service/KwfTruckService.java

@@ -2146,8 +2146,14 @@ public class KwfTruckService {
      */
     public TruckDetailResp truckDetail(TruckDetailParam param) {
         log.info("查询司机详情，id：{}", JSON.toJSONString(param));
+        if (param.getId() == null && (param.getTruckNo() == null || param.getTruckNo().trim().isEmpty())) {
+            return new TruckDetailResp();
+        }
+        
         KwfTruck truck = kwfTruckRepository.getOne(Wrappers.<KwfTruck>lambdaQuery()
-                .eq(KwfTruck::getId, param.getId()));
+                .eq(param.getId() != null, KwfTruck::getId, param.getId())
+                .eq(param.getTruckNo() != null && !param.getTruckNo().trim().isEmpty(), KwfTruck::getTruckNo, param.getTruckNo())
+                .last("limit 1"));
         if (truck == null) {
             return new TruckDetailResp();
         }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/KwsUser.java

@@ -62,5 +62,9 @@ public class KwsUser extends BaseModel {
      * 盐
      */
     private String salt;
+    /**
+     * 司机id
+     */
+    private String driverId;
 
 }

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/res/KwsUserResVo.java

@@ -134,4 +134,6 @@ public class KwsUserResVo implements Serializable {
     private Date updateTime;
     private List<RoleInfoDto> roleInfoDto;
 
+    private Long driverId;
+
 }

sckw-modules/sckw-system/src/main/resources/mapper/KwsUserDao.xml

@@ -335,6 +335,7 @@
                su.status,
                su.salt,
                su.ent_id,
+               su.driver_id,
                u1.name createByName,
                su.create_time,
                su.update_time