1.机构权限bug；2.BS、PL预览bug

atms-api/src/main/java/pwc/taxtech/atms/controller/OrganizationController.java

@@ -95,7 +95,7 @@ public class OrganizationController {
     public @ResponseBody
     List<OrgSelectDto> getOrgSimpleList() {
         logger.info("GET /api/v1/org/getOrgListByUserId");
-        return organizationService.getOrgSimpleList();
+        return organizationService.getMyOrgList();
     }
 
 //    @ApiOperation(value = "纳税人识别号唯一性验证")

atms-api/src/main/java/pwc/taxtech/atms/service/impl/DataPreviewSerivceImpl.java

@@ -27,6 +27,7 @@ import javax.servlet.http.HttpServletResponse;
 import java.io.OutputStream;
 import java.math.BigDecimal;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * @Auther: Gary J Li
@@ -98,7 +99,7 @@ public class DataPreviewSerivceImpl extends BaseService {
         ProfitLossStatementCondition condition = beanUtil.copyProperties(param, new ProfitLossStatementCondition());
 
         Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
-        List<ProfitLossStatement> profitLossStatements = profitLossStatementPrcMapper.selectByCondition(condition);
+        List<ProfitLossStatementPrc> profitLossStatements = profitLossStatementPrcMapper.selectByCondition(condition);
         List<ProfitLossStatementDto> profitLossDtos = Lists.newArrayList();
 
         profitLossStatements.forEach(pl -> {
@@ -196,10 +197,10 @@ public class DataPreviewSerivceImpl extends BaseService {
         BalanceSheetCondition condition = beanUtil.copyProperties(param, new BalanceSheetCondition());
 
         Page page = PageHelper.startPage(condition.getPageInfo().getPageIndex(), condition.getPageInfo().getPageSize());
-        List<BalanceSheet> balanceSheets = balanceSheetPrcMapper.selectByCondition(condition);
+        List<BalanceSheetPrc> bsPrcList = balanceSheetPrcMapper.selectByCondition(condition);
         List<BalanceSheetDto> balanceSheetDtos = Lists.newArrayList();
 
-        balanceSheets.forEach(bs -> {
+        bsPrcList.forEach(bs -> {
             BalanceSheetDto balanceSheetDto = new BalanceSheetDto();
             beanUtil.copyProperties(bs, balanceSheetDto);
             balanceSheetDtos.add(balanceSheetDto);
@@ -343,7 +344,7 @@ public class DataPreviewSerivceImpl extends BaseService {
 
             ProfitLossStatementCondition condition = new ProfitLossStatementCondition();
             beanUtil.copyProperties(param, condition);
-            List<ProfitLossStatement> profitLossStatements = profitLossStatementPrcMapper.selectByCondition(condition);
+            List<ProfitLossStatementPrc> profitLossStatements = profitLossStatementPrcMapper.selectByCondition(condition);
             Map<String, String> header = generalPLHeader();
             List<ProfitLossStatementExportDto> cellList = new ArrayList<>();
             profitLossStatements.forEach(pl -> {
@@ -384,7 +385,7 @@ public class DataPreviewSerivceImpl extends BaseService {
         try {
             BalanceSheetCondition condition = new BalanceSheetCondition();
             beanUtil.copyProperties(param, condition);
-            List<BalanceSheet> balanceSheets = balanceSheetPrcMapper.selectByCondition(condition);
+            List<BalanceSheetPrc> balanceSheets = balanceSheetPrcMapper.selectByCondition(condition);
             Map<String, String> header = generalBSHeader();
             List<BalanceSheetExportDto> cellList = new ArrayList<>();
             balanceSheets.forEach(bs -> {

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/BalanceSheetPrcMapper.java

@@ -108,7 +108,7 @@ public interface BalanceSheetPrcMapper extends MyVatMapper {
      */
     int updateByPrimaryKey(BalanceSheetPrc record);
 
-    List<BalanceSheet> selectByCondition(@Param("bsCondition") BalanceSheetCondition condition);
+    List<BalanceSheetPrc> selectByCondition(@Param("bsCondition") BalanceSheetCondition condition);
 
     int insertBatch(List<BalanceSheet> bls);
 }
\ No newline at end of file

atms-dao/src/main/java/pwc/taxtech/atms/vat/dao/ProfitLossStatementPrcMapper.java

@@ -108,7 +108,7 @@ public interface ProfitLossStatementPrcMapper extends MyVatMapper {
      */
     int updateByPrimaryKey(ProfitLossStatementPrc record);
 
-    List<ProfitLossStatement> selectByCondition(@Param("plCondition") ProfitLossStatementCondition condition);
+    List<ProfitLossStatementPrc> selectByCondition(@Param("plCondition") ProfitLossStatementCondition condition);
 
     int insertBatch(List<ProfitLossStatement> pls);
 }
\ No newline at end of file

atms-web/src/main/webapp/app/common/controls/vat-report-view/vat-report-view.ctrl.js

@@ -2973,13 +2973,14 @@
             //         }
             //     });
 
-            if ($scope.templateCode === 'BS001' || $scope.templateCode === 'PL001') {
-                //show cell detail panel
-                $scope.isBSPL = true;
-                $scope.moduleid = enums.vatModuleEnum.Report_BSPL;
-            } else {
-                $scope.isBSPL = false;
-            }
+            // if ($scope.templateCode === 'BS001' || $scope.templateCode === 'PL001') {
+            //     //show cell detail panel
+            //     $scope.isBSPL = true;
+            //     $scope.moduleid = enums.vatModuleEnum.Report_BSPL;
+            // } else {
+            //     $scope.isBSPL = false;
+            // }
+            $scope.isBSPL = false;
 
             //load cell data
             loadCellData(getActualPeriod());