bug修复;

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);
     }