1、fixbug

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

@@ -1720,7 +1720,7 @@ public class DataImportService extends BaseService {
         // todo 调用滴滴的http财务数据抽取调用接口 List<String> codes, Integer period, List<Integer> dataTypes
         OrganizationExample example = new OrganizationExample();
         example.createCriteria().andIdIn(dataExtractParam.getOrgIds());
-        List<String> codes = organizationMapper.selectByExample(example).stream().map(Organization::getCode).collect(Collectors.toList());
+        List<Organization> orgs = organizationMapper.selectByExample(example);
 //        HttpUtil.post();
         Integer tmsPeriod = DateUtils.strToPeriod(dataExtractParam.getPeriod());
 //       data_import_log 日志记录为 EnumImportType.ExtractFinancialData

atms-dao/src/main/java/pwc/taxtech/atms/dao/MyUserMapper.java

@@ -47,12 +47,12 @@ public interface MyUserMapper extends MyMapper {
     List<Map<String, String>> selectUserRoleListByUserId(@Param(value = "userId") String userId);
 
     @Select("select q.id as id, q.organization_id as OrganizationID, q.user_id as UserID, q.is_accessible as IsAccessible, " +
-            "q.has_original_role as HasOriginalRole from user_organization q join User u on q.user_id = u.id "
+            "q.has_original_role as HasOriginalRole from user_organization q join user u on q.user_id = u.id "
             + "where u.status = 1")
     @Results({ @Result(id = true, column = "id", property = "id"),
-            @Result(column = "OrganizationID", property = "organizationID"),
+            @Result(column = "OrganizationID", property = "organizationId"),
             @Result(column = "HasOriginalRole", property = "hasOriginalRole"),
-            @Result(column = "UserID", property = "userID"),
+            @Result(column = "UserID", property = "userId"),
             @Result(column = "IsAccessible", property = "isAccessible") })
     List<UserOrganization> selectUserOrganizationByUserId();
 

atms-web/src/main/webapp/app/admin/infrastructure/userList/user-list.ctrl.js

@@ -58,7 +58,7 @@
                         cellTemplate: function (container, options) {
                             try {
                                 $('<a class="hyper-link">' + options.value + '</a>')
-                                    .attr('href', '#/userDetail/' + options.row.data.id)
+                                    .attr('href', '#/userDetail/' + options.row.data.ID)
                                     .appendTo(container);
                             }
                             catch (e) {

atms-web/src/main/webapp/app/common/utils/constant.js

@@ -716,6 +716,14 @@ constant.adminPermission = {
 
     basicData: {
 
+        mainData:{
+            queryCode : '01.001.012'
+        },
+
+        financialData:{
+            queryCode : '01.001.013'
+        },
+
         // 企业账套
         enterpriseAccountSet: {
             // 查看
@@ -845,6 +853,65 @@ constant.adminPermission = {
     }
 };
 
+constant.batchImportPermisson = {
+    ExtractDistribution:{
+        code : '04.001',
+        financialDataExtraction:{
+            code: '04.001.001'
+
+        },
+        invoiceDataExtraction:{
+            code: '04.001.002'
+        }
+    },
+
+    ImportDistribution:{
+        code: '04.002',
+
+        vATInvoiceRecord:{code:'04.002.001'},
+        certifiedInvoicesList:{code:'04.002.002'},
+        redLetterVATSpecialInvoiceInfo:{code:'04.002.003'},
+        invoiceInformation:{code:'04.002.004'},
+        coupaInvoiceReport:{code:'04.002.005'},
+        adjustmentTable:{code:'04.002.006'},
+        balanceSheetPRC:{code:'04.002.007'},
+        incomeStatementPRC:{code:'04.002.008'},
+        cashFlowStatement:{code:'04.002.009'},
+        cITAdjustmentJournal:{code:'04.002.010'},
+        cITTrialBalance:{code:'04.002.011'},
+        cITDocumentSubjectMappingTable:{code:'04.002.012'},
+        cITBalanceSheetPRC:{code:'04.002.013'},
+        cITProfitStatementPRC:{code:'04.002.014'},
+        cITEAMAssetDisposalAmountRecord:{code:'04.002.015'},
+        cITPreClassifiedDataSource:{code:'04.002.016'}
+    },
+    Configuration:{
+        RevenueTypeConfiguration:{code:'04.003.001'},
+        BillingRecordAndRevenueTypeMappingConfiguration:{code:'04.003.002'},
+        InputRollOutConfiguration:{code:'04.003.003'}
+    },
+
+    log:{
+        code:'05',
+        dataImportRecord:{code:'04.004.001'},
+        dataProcessingCheckRecord:{code:'04.004.002'}
+    }
+};
+
+constant.analysisPermisson = {
+    code : '05',
+    Dashboard: {code: '05.001'},
+    DataImport: {
+        code: '05.002',
+        DomesticDataImport: {code: '05.002.001'},
+        InternationalDataImport: {code: '05.002.002'}
+    },
+    Form: {
+        code: '05.003',
+        TBEBITForm:{code:'05.003.001'}
+    }
+};
+
 constant.citMenuList = [
     constant.citPermission.dataImport.balanceSheet.queryCode,
     constant.citPermission.dataImport.journalEntry.queryCode,

atms-web/src/main/webapp/app/common/webservices/user.svc.js

@@ -92,7 +92,7 @@ webservices.factory('userService', ['$http', 'apiConfig', 'httpCacheService', 'l
             return $http.post('/user/addUsersToRole', userRoleList, apiConfig.create())
         },
         getUserRoleListByUserID: function (userId) {
-            return $http.get('/user/getUserRoleListByUserID?userId=' + userId, apiConfig.create());
+            return $http.get('/user/getUserRoleListByUserId?userId=' + userId, apiConfig.create());
         },
         deleteUserRoleDimension: function (userRoleList) {
             return $http.post('/user/deleteUserRoleDimension', userRoleList, apiConfig.create())
@@ -104,7 +104,7 @@ webservices.factory('userService', ['$http', 'apiConfig', 'httpCacheService', 'l
             return $http.post('/user/deleteUserRoleForOrg', userOrgdto, apiConfig.create());
         },
         getUserRoleByOrgIDUserID: function (userID, orgID) {
-            return $http.get('/user/getUserRoleByOrgIDUserID?userID=' + userID + '&orgID=' + orgID, apiConfig.create());
+            return $http.get('/user/getUserRoleByOrgIdUserId?userId=' + userID + '&orgId=' + orgID, apiConfig.create());
         },
         getUserRoleByUserID: function (userID) {
             return $http.get('/user/getUserRoleByUserID?userID=' + userID, apiConfig.create());