1、fix

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

@@ -1046,13 +1046,19 @@ public class UserServiceImpl extends AbstractService {
         if(data.size()<1){
             throw new ServiceException(ErrorMessage.ExportFailed);
         }
-        data.forEach(d->{
+        for(UserRoleInfo d :data){
             if(!d.getRoleInfoList().isEmpty()){
                 List<String> rList = d.getRoleInfoList().stream().map(RoleInfo::getName).collect(Collectors.toList());
                 d.setRoleList(JSON.toJSONString(rList));
             }
-            d.setStatusStr(d.getStatus());
-        });
+            String statusStr = "";
+            if(d.getStatus() == 0){
+                statusStr = "禁用";
+            }else{
+                statusStr = "启用";
+            }
+            d.setStatusStr(statusStr);
+        }
 
         OutputStream outputStream = commonDocumentHelper.toXlsxFileUsingJxls(data, excelTemplatePathInClassPath);
         try {

atms-dao/src/main/java/pwc/taxtech/atms/dpo/UserRoleInfo.java

@@ -248,11 +248,4 @@ public class UserRoleInfo {
     public void setStatusStr(String statusStr) {
         this.statusStr = statusStr;
     }
-
-    public void setStatusStr(Integer status) {
-        if(status == 0){
-            this.statusStr = "禁用";
-        }
-        this.statusStr = "启用";
-    }
 }

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.ctrl.js

@@ -1344,6 +1344,11 @@
                         dataField: "approvedLevyProject",
                         allowHeaderFiltering: false,
                         caption: $translate.instant('ApprovedLevyProject'),
+                        lookup: {
+                            dataSource: constant.GroupTypeList,
+                            displayExpr: "type",
+                            valueExpr: "type"
+                        },
                         width: '15%'
                     }, {
                         dataField: "approvedValidityPeriodStartTime",

atms-web/src/main/webapp/app/admin/infrastructure/organizationManage/organization-manage.less

@@ -549,6 +549,7 @@
 
                       .leftUp {
                         width: 50%;
+                        margin-bottom: -40px;
                       }
 
                       .rightUp {

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

@@ -969,7 +969,7 @@
             var doExport = function () {
                 var localDate=$filter('date')(new  Date(), 'yyyyMMddHHmmss');
                 var fileName = '用户信息列表'+localDate;
-                userService.downloadFile($scope.originalUserRoleList,fileName).then(function (data) {
+                userService.downloadFile($scope.userRoleList,fileName).then(function (data) {
                     if (data) {
                         ackMessageBox.success(translate('FileExportSuccess'));
                     }

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

@@ -1444,10 +1444,11 @@ constant.TaxDecCycleList = [
 ];
 
 constant.ApprovedLevyTermList = [
-    {code:0,type:"月"},
-    {code:1,type:"季"},
-    {code:2,type:"半年"},
-    {code:3,type:"年"}
+    {code:0,type:"次"},
+    {code:1,type:"月"},
+    {code:2,type:"季"},
+    {code:3,type:"半年"},
+    {code:4,type:"年"}
 ];
 
 constant.TaxpayerQualificationTypeList = [