企业国别添加组织查询条件

mhd_oms/src/main/java/com/mhd/oms/application/service/erpCountry/ErpCountryApplicationService.java

@@ -42,6 +42,13 @@ public class ErpCountryApplicationService{
     private GwLogMapper gwLogMapper;
 
     public TableDataInfo queryList(ErpCountryDTO erpCountryDTO) {
+        LoginUser loginUser = SecurityUtils.getLoginUser();
+        if (loginUser != null) {
+            Long topOrganizationId = loginUser.getUserPo().getTopOrganizationId();
+            if (topOrganizationId != null && topOrganizationId != 1) {
+                erpCountryDTO.setTopOrganizationId(topOrganizationId);
+            }
+        }
         List<ErpCountryPO> list = erpCountryMapper.queryList(erpCountryDTO);
         TableDataInfo tableDataInfo = new TableDataInfo();
         tableDataInfo.setData(list);

mhd_oms/src/main/java/com/mhd/oms/domain/erpCountry/entity/ErpCountry.java

@@ -40,6 +40,9 @@ public class ErpCountry implements Serializable {
     @ApiModelProperty("推送人")
     private Long pushBy;
 
+    @ApiModelProperty("推送人姓名")
+    private String pushByName;
+
     @ApiModelProperty("所属组织ID")
     private Long organizationId;
 

mhd_oms/src/main/java/com/mhd/oms/interfaces/dto/erpCountry/ErpCountryDTO.java

@@ -29,4 +29,7 @@ public class ErpCountryDTO {
 
     @ApiModelProperty(value = "所属组织ID")
     private Long organizationId;
+
+    @ApiModelProperty(value = "所属组织ID")
+    private Long TopOrganizationId;
 }