tms3.24修改

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

@@ -5063,18 +5063,18 @@ public class UserApplicationService {
         
         // 数据隔离：根据 organizationId 字段来实现
         // 如果当前登录用户的organizationId为2827，可查询全部组织数据；其他组织只能查询自己组织的数据
-        if (loginUserOrganizationId != null && loginUserOrganizationId.equals(2827L)) {
+//        if (loginUserOrganizationId != null && loginUserOrganizationId.equals(2827L)) {
             // 南光组织：查询所有组织的数据，不设置 organizationId 和 userId 过滤条件
-            filterOrganizationId = null;
-            userId = null;
-        } else {
-            // 其他组织：只查询自己组织的数据
-            filterOrganizationId = loginUserOrganizationId;
-            // 如果当前登录用户是货主或企业用户，只查询当前登录用户的信息
-            if(loginUser.getUserPo().getBusinessType()==1||loginUser.getUserPo().getBusinessType()==3||loginUser.getUserPo().getUserAccountType()==5){
-                userId = loginUser.getUserid();
-            }
-        }
+//            filterOrganizationId = null;
+//            userId = null;
+//        } else {
+//            // 其他组织：只查询自己组织的数据
+//            filterOrganizationId = loginUserOrganizationId;
+//            // 如果当前登录用户是货主或企业用户，只查询当前登录用户的信息
+//            if(loginUser.getUserPo().getBusinessType()==1||loginUser.getUserPo().getBusinessType()==3||loginUser.getUserPo().getUserAccountType()==5){
+//                userId = loginUser.getUserid();
+//            }
+//        }
         return userDomainService.findAllShipperInfo(userId, filterOrganizationId);
     }
 

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

@@ -163,6 +163,9 @@ public class UserShipperApplicationService {
                     log.warn("托运人列表查询 - 前端传递的组织ID {} 与当前登录用户的组织ID {} 不一致，使用当前登录用户的组织ID进行过滤", 
                         frontendOrganizationId, loginUserOrganizationId);
                     userShipperDO.setOrganizationId(loginUserOrganizationId);
+                    if (frontendOrganizationId.equals(2827L)){
+                        userShipperDO.setOrganizationId(null);
+                    }
                 } else {
                     // 前端传递的 organizationId 与当前登录用户的组织ID一致，使用前端传递的值
                     userShipperDO.setOrganizationId(frontendOrganizationId);

mhd_product/src/main/resources/mapper/organization/OrganizationMapper.xml

@@ -96,7 +96,11 @@
             o1.receiving_bank,
             o1.receiving_number,
             o1.interbank_number,
-            o1.template_seal
+            o1.template_seal,
+            o1.company_name,
+            o1.company_name_en,
+            o1.contact,
+            o1.contact_phone
         FROM
             sys_organization o1
                 LEFT JOIN