Merge branch 'wms_dev' into wms_dev_hbbf

# Conflicts:
#	mhd-api/mhd-api-system/src/main/java/com/mhd/system/api/UserServiceFeign.java
#	mhd_oms/pom.xml

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

@@ -157,6 +157,10 @@ public class CommonApplicationService {
             UserDO queryAccount = new UserDO();
             queryAccount.setTopOrganizationId(topOrganizationId);
             queryAccount.setUserAccount(userDO.getUserAccount());
+            // 如果指定了角色，只检查相同角色的用户
+            if (StrUtil.isNotEmpty(userDO.getRoleCode())) {
+                queryAccount.setRoleCode(userDO.getRoleCode());
+            }
             userPo = userDomainService.findByTopOrganizationIdAndUserAccount(queryAccount);
         }
         //根据手机号查询
@@ -165,6 +169,10 @@ public class CommonApplicationService {
             UserDO queryPhone = new UserDO();
             queryPhone.setTopOrganizationId(topOrganizationId);
             queryPhone.setUserPhone(userDO.getUserPhone());
+            // 如果指定了角色，只检查相同角色的用户
+            if (StrUtil.isNotEmpty(userDO.getRoleCode())) {
+                queryPhone.setRoleCode(userDO.getRoleCode());
+            }
             userPoTwo = userDomainService.findByTopOrganizationIdAndUserPhone(queryPhone);
         }
         //根据身份证号查询

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

@@ -441,6 +441,32 @@ public class UserApplicationService {
         return userPo;
     }
 
+    /**
+     * @Description 根据用户ID获取用户信息
+     * @Author Alex
+     * @Date 2022/12/20 17:12
+     */
+    public UserPo selectByUserName(String userName) {
+        if (StringUtils.isEmpty(userName)) {
+            LoginUser loginUser = SecurityUtils.getLoginUser();
+            userName = loginUser.getUsername();
+        }
+        UserPo userPo = userDomainService.selectByUserName(userName);
+        if (userPo != null){
+            userPo.setPrincipalAccount(userPo.getUserAccount());
+        }
+        if (StringUtils.isNotEmpty(userPo.getRoleCode())){
+            String[] split = userPo.getRoleCode().split(";");
+            List<String> list = CollectionUtil.toList(split);
+            userPo.setRoleCodeList(list);
+        }
+        UserShipperPo userShipperPo = userShipperDomainService.selectByUserId(userPo.getUserId());
+        if(null != userShipperPo){
+            userPo.setEsignEnterpriseStatus(userShipperPo.getEsignEnterpriseStatus());
+        }
+        return userPo;
+    }
+
     /**
      * @Description 分配用户默认普通用户角色
      * @Author Alex
@@ -1196,7 +1222,7 @@ public class UserApplicationService {
                     (userDO.getUserAccountType() == null || userDO.getUserAccountType() < 4)) {
                 //给用户分配默认普通角色权限
                 RoleDo roleDo = new RoleDo();
-                roleDo.setRoleCode(RoleEnum.MUST.getCode());
+                roleDo.setRoleCode(RoleEnum.OWNER_CARGO.getCode());
                 roleDo.setOrganizationId(userEntity.getOrganizationId());
                 RoleEntity roleEntity = roleDomainService.selectByOrganizationIdAndRoleCode(roleDo);
                 if (roleEntity != null) {
@@ -1206,8 +1232,8 @@ public class UserApplicationService {
                     userDO.setRoleId(roleEntity.getRoleId());
                     userRoleDomainService.addUserRole(userRoleDo);
                 }
-                userDO.setRoleCode(RoleEnum.MUST.getCode());
-                userDO.setRoleName(RoleEnum.MUST.getName());
+                userDO.setRoleCode(RoleEnum.OWNER_CARGO.getCode());
+                userDO.setRoleName(RoleEnum.OWNER_CARGO.getName());
                 userDO.setUserId(userEntity.getUserId());
                 userDomainService.updateUser(userDO);
             }else{
@@ -4913,7 +4939,7 @@ public class UserApplicationService {
         Map<String, SysDepartInterfaceInfoPo> sysDepartInterfaceInfoPoMap = sysDepartInterfaceInfoPos.stream().collect(Collectors.toMap(SysDepartInterfaceInfoPo::getInterfaceTypeKey, Function.identity()));
         SysDepartInterfaceInfoPo sysDepartInterfaceInfoPo = sysDepartInterfaceInfoPoMap.get("isWT");
         //是否开启
-        if ("1".equals(sysDepartInterfaceInfoPo.getInterfaceTypeValue())) {
+        if (sysDepartInterfaceInfoPo != null && "1".equals(sysDepartInterfaceInfoPo.getInterfaceTypeValue())) {
             return true;
         }
         return false;
@@ -4969,4 +4995,4 @@ public class UserApplicationService {
     public UserPo selectUserTableByUserId(Long userId){
         return userDomainService.selectByUserId(userId);
     }
-}
+}