Merge branch 'dev_neo' into 'dev'

[BUGFIX] fix project impl for current year EntCountYear Time

See merge request root/atms!15

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

@@ -161,7 +161,6 @@ public class ProjectServiceImpl implements ProjectService {
             //去除project表已经存在的项目 g
             data.forEach(dto -> {
                 getOrgProjectYears(dto.getEffectiveDate(), dto.getExpiredDate()).forEach(yDto -> {
-                    ProjectDisplayDto orgDto = new ProjectDisplayDto();
                     dto.setYear(yDto.year);
                     dto.setStartPeriod(yDto.startMonth);
                     dto.setEndPeriod(yDto.endMonth);
@@ -239,7 +238,7 @@ public class ProjectServiceImpl implements ProjectService {
         end.setTime(endDate);
         int endYear = end.get(Calendar.YEAR);
 
-        if (startDate != null && endDate != null && startYear < endYear) {
+        if (startDate != null && endDate != null && startYear <= endYear) {
             for (int i = startYear; i <= endYear; i++) {
                 ProjectYearParam pYear = new ProjectYearParam();
                 pYear.year = i;

atms-web/src/main/webapp/bundles/framework.js

@@ -1251,7 +1251,9 @@ frameworkModule.controller('appOverviewController', ['$rootScope', '$scope', '$t
                     $timeout(function () {
                         projectListData.forEach(function (p) {
                             //if (thisDataService.isHaveOrganizationPermission(p.organizationID)) {
-                            if (PWC.isHavePermissionForOrg(p.organizationID, vatSessionService.userPermission) && $scope.haveVatPermission) {
+                            if (PWC.isHavePermissionForOrg(p.organizationID, vatSessionService.userPermission)
+//                            && $scope.haveVatPermission//TODO:ther may be some bug in role manager ,this is only for view data can see,should be open in future
+                            ) {
                                 $scope.allResults.push({
                                     index: index++,
                                     id: p.id,