bug修复;

mhd-user-center/src/main/java/com/mhd/user/application/service/UserApplicationService.java

@@ -2042,6 +2042,7 @@ public class UserApplicationService {
             VehiclePo vehiclePo = new VehiclePo();
             sysUser.setUserid(userPo.getUserId());
             sysUser.setUsername(userPo.getUserAccount());
+            sysUser.setRealname(userPo.getUserName());
             UserDriverPo userDriverPo = userDriverDomainService.selectByUserId(userPo.getUserId());
             if (ObjectUtil.isNull(userDriverPo)) {
                 userDriverPo = new UserDriverPo();

mhd-user-center/src/main/java/com/mhd/user/application/service/UserDriverApplicationService.java

@@ -2052,6 +2052,42 @@ public class UserDriverApplicationService {
         return mapList;
     }
 
+    public List<Map<String, String>> userPersonalDriverAuthList() {
+        //获取当前登录人
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (ObjectUtil.isNull(loginUser)) {
+            throw new DigitalLogisticsException(UserError.TIMEOUT);
+        }
+
+        UserDriverDO userDriverDO = new UserDriverDO();
+        //20240227 修改为查询用户关联的司机数据，包括车队长、承运企业
+        List<UserDriverPo> userDriverPos = userDriverDomainService.userPersonalDriverAuthList(userDriverDO);
+
+        List<Map<String, String>> mapList = new ArrayList<>();
+        if (CollUtil.isNotEmpty(userDriverPos)) {
+            for (UserDriverPo u : userDriverPos) {
+                Map<String, String> map = new HashMap<>();
+                map.put("userId", u.getUserId().toString());
+
+                StringBuilder str = new StringBuilder();
+                str.append(u.getUserName());
+
+                if (StrUtil.isNotEmpty(u.getUserPhone())) {
+                    str.append(", ").append(u.getUserPhone());
+                }
+
+                if (StrUtil.isNotEmpty(u.getDriverEnterpriseName())) {
+                    str.append("【").append(u.getDriverEnterpriseName()).append("】");
+                }
+
+                map.put("label", String.valueOf(str));
+                mapList.add(map);
+            }
+        }
+
+        return mapList;
+    }
+
     /**
      * 车队认证-车队长查询
      */

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/factory/UserFactory.java

@@ -1,5 +1,6 @@
 package com.mhd.user.domain.userAggregate.factory;
 
+import cn.hutool.core.util.ObjectUtil;
 import com.mhd.user.domain.userAggregate.entity.UserEntity;
 import com.mhd.common.core.domain.po.UserPo;
 import com.mhd.user.domain.userAggregate.repository.todo.UserDO;
@@ -20,6 +21,7 @@ public class UserFactory {
     public UserEntity getUserEntity(UserDO userDO) {
         UserEntity userEntity = new UserEntity();
         BeanUtils.copyProperties(userDO,userEntity, IgnoreNullUtil.getNullPropertyNames(userDO));
+        userEntity.setDepartmentId(ObjectUtil.isNotEmpty(userDO.getDepartmentId())?Integer.valueOf(userDO.getDepartmentId()):null);
         return userEntity;
     }
     public CheckDO getCheckDo(UserDO userDO) {

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/facade/UserDriverRepositoryInterface.java

@@ -55,6 +55,8 @@ public interface UserDriverRepositoryInterface extends IService<UserDriverEntity
 
     List<UserDriverPo> userDriverAuthList(UserDriverDO userDriverDO);
 
+    List<UserDriverPo> userPersonalDriverAuthList(UserDriverDO userDriverDO);
+
     List<Map<String, Object>> motorcadeAuthCaptainList(Long organizationId);
 
     List<UserDriverPo> getRegionDriverList(UserDriverDO userDriverDO);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/mapper/UserDriverMapper.java

@@ -54,6 +54,8 @@ public interface UserDriverMapper extends BaseMapper<UserDriverEntity> {
 
     List<UserDriverPo> userDriverAuthList(UserDriverDO userDriverDO);
 
+    List<UserDriverPo> userPersonalDriverAuthList(UserDriverDO userDriverDO);
+
     List<Map<String, Object>> motorcadeAuthCaptainList(Long organizationId);
 
     List<UserDriverPo> getRegionDriverList(@Param("userDriverDO") UserDriverDO userDriverDO);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/repository/persistence/UserDriverRepositoryImpl.java

@@ -183,6 +183,11 @@ public class UserDriverRepositoryImpl extends ServiceImpl<UserDriverMapper,UserD
         return userDriverMapper.userDriverAuthList(userDriverDO);
     }
 
+    @Override
+    public List<UserDriverPo> userPersonalDriverAuthList(UserDriverDO userDriverDO) {
+        return userDriverMapper.userPersonalDriverAuthList(userDriverDO);
+    }
+
     @Override
     public List<Map<String, Object>> motorcadeAuthCaptainList(Long organizationId) {
         return userDriverMapper.motorcadeAuthCaptainList(organizationId);

mhd-user-center/src/main/java/com/mhd/user/domain/userAggregate/service/UserDriverDomainService.java

@@ -187,6 +187,11 @@ public class UserDriverDomainService {
         return userDriverRepositoryInterface.userDriverAuthList(userDriverDO);
     }
 
+    @DataPermissions(cacheName = "master")
+    public List<UserDriverPo> userPersonalDriverAuthList(UserDriverDO userDriverDO) {
+        return userDriverRepositoryInterface.userPersonalDriverAuthList(userDriverDO);
+    }
+
     public List<Map<String, Object>> motorcadeAuthCaptainList(Long organizationId) {
         return userDriverRepositoryInterface.motorcadeAuthCaptainList(organizationId);
     }

mhd-user-center/src/main/java/com/mhd/user/interfaces/facade/UserDriverAPI.java

@@ -246,6 +246,17 @@ public class UserDriverAPI extends BaseController {
         return AjaxResult.success(userDriverApplicationService.userDriverAuthList());
     }
 
+    /**
+     * 车辆认证-承运人查询(个人司机)
+     * @return
+     */
+    @Log(title = "承运人管理-查询", description ="车辆认证-承运人查询(个人司机)",businessType = BusinessType.INQUIRE)
+    @ApiOperation("车辆认证-承运人查询(个人司机)")
+    @GetMapping("/userPersonalDriverAuthList")
+    public AjaxResult userPersonalDriverAuthList() {
+        return AjaxResult.success(userDriverApplicationService.userPersonalDriverAuthList());
+    }
+
     /**
      * 车辆导入-承运人查询
      * @return

mhd-user-center/src/main/java/com/mhd/user/interfaces/vo/QueryAllShipperInfoVo.java

@@ -58,4 +58,7 @@ public class QueryAllShipperInfoVo {
 
     @ApiModelProperty("是否有默认地址")
     private Boolean hasDefaultAddress;
+
+    @ApiModelProperty("用户nc")
+    private String documentPreparerNcCode;
 }