获取组织数 添加 是否显示字段

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/controller/screen/AgencyController.java

@@ -31,8 +31,8 @@ public class AgencyController {
     private AgencyService agencyService;
 
     /**
-     * @Description  1、组织机构树
      * @param
+     * @Description 1、组织机构树 只返回 is_display = '1'的
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/AgencyService.java

@@ -14,8 +14,8 @@ import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
 public interface AgencyService {
 
     /**
-     * @Description  1、组织机构树
      * @param
+     * @Description 1、组织机构树 只返回 is_display = '1'的
      * @author zxc
      * @date 2020/8/18 2:04 下午
      */

epmet-module/data-report/data-report-server/src/main/java/com/epmet/datareport/service/evaluationindex/screen/impl/AgencyServiceImpl.java

@@ -13,7 +13,6 @@ import com.epmet.evaluationindex.screen.dto.form.CompartmentFormDTO;
 import com.epmet.evaluationindex.screen.dto.result.AgencyDistributionResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.CompartmentResultDTO;
 import com.epmet.evaluationindex.screen.dto.result.TreeResultDTO;
-import org.apache.commons.lang3.StringUtils;
 import org.apache.ibatis.exceptions.TooManyResultsException;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
@@ -48,11 +47,6 @@ public class AgencyServiceImpl implements AgencyService {
         // 1. 查询客户根组织ID
         String customerId = externalAppRequestParam.getCustomerId();
 
-
-        // 验签关闭，customerId无法获取，暂时写死
-        if (StringUtils.isBlank(customerId)) {
-            customerId = "b09527201c4409e19d1dbc5e3c3429a1";
-        }
         TreeResultDTO rootAgency = null;
         try {
             rootAgency = screenCustomerAgencyDao.selectRootAgencyId(customerId);

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerAgencyDao.xml

@@ -16,6 +16,7 @@
         WHERE
             del_flag = 0
             AND pid = '0'
+            AND IS_DISPLAY = '1'
             AND customer_id = #{customerId}
     </select>
 
@@ -31,6 +32,7 @@
             screen_customer_agency
         WHERE
             del_flag = '0'
+            AND IS_DISPLAY = '1'
             AND pids = #{subAgencyPids}
         ORDER BY
             created_time DESC

epmet-module/data-report/data-report-server/src/main/resources/mapper/screen/ScreenCustomerGridDao.xml

@@ -77,6 +77,7 @@
             screen_customer_grid
         WHERE
             del_flag = '0'
+          AND IS_DISPLAY = '1'
           AND parent_agency_id = #{agencyId}
         ORDER BY
             created_time DESC