Merge remote-tracking branch 'remotes/origin/dev_bugfix_ljj' into shibei_master

epmet-module/data-aggregator/data-aggregator-server/src/main/resources/mapper/govproject/ProjectDao.xml

@@ -29,7 +29,6 @@
         WHERE
             p.DEL_FLAG = '0'
             AND p.CUSTOMER_ID = #{customerId}
-            AND p.ORG_ID_PATH LIKE concat('%', #{agencyId}, '%')
             <if test="projectStatus != null and projectStatus != ''">
                 AND p.`STATUS` = #{projectStatus}
             </if>

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

@@ -160,10 +160,10 @@ public class IndexController {
      * @author sun
      */
     @PostMapping("advancedbranchrank-shibei")
-    Result<List<OrgRankDataShibeiResultDTO>> advancedBranchRankShibei(@RequestBody AdvancedBranchRankFormDTO formDTO, /*@LoginUser*/ TokenDto loginUser){
+    Result<List<OrgRankDataShibeiResultDTO>> advancedBranchRankShibei(@RequestBody AdvancedBranchRankFormDTO formDTO, @LoginUser TokenDto loginUser){
         ValidatorUtils.validateEntity(formDTO, AdvancedBranchRankFormDTO.AddUserInternalGroup.class);
         formDTO.setCustomerId(loginUser.getCustomerId());
-        formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
+        //formDTO.setCustomerId("45687aa479955f9d06204d415238f7cc");
         return new Result<List<OrgRankDataShibeiResultDTO>>().ok(indexService.advancedBranchRankShibei(formDTO));
     }
 

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

@@ -19,6 +19,7 @@
             AND rankData.ORG_TYPE = 'grid'
             AND rankData.ALL_PARENT_IDS LIKE CONCAT('%',#{agencyId},'%')
             AND rankData.MONTH_ID = #{monthId}
+            AND rankData.CUSTOMER_ID = #{customerId}
             ORDER BY
             rankData.SCORE DESC
             LIMIT #{topNum}