绩效debug

pmapi/src/main/java/com/ningdatech/pmapi/performance/convert/PerformanceAppraisalConveter.java

@@ -35,6 +35,8 @@ public class PerformanceAppraisalConveter {
                     vo.setProjectType(project.getProjectType());
                     vo.setProjectTypeName(getProjectTypeName(project.getProjectType()));
                     vo.setBuildOrgName(project.getBuildOrgName());
+                    vo.setDeclareAmount(project.getDeclareAmount());
+                    vo.setProjectYear(project.getProjectYear());
                 }
                 return vo;
             }).collect(Collectors.toList());
@@ -54,7 +56,6 @@ public class PerformanceAppraisalConveter {
                             application.getApplicationName() : application.getAccountAppName());
                     vo.setApplicationType(application.getApplicationType());
                     vo.setBizDomain(application.getBizDomain());
-//                    vo.setBuildOrgName(application.get());
                     vo.setPublishSide(application.getPublishSide());
                 }
                 return vo;

pmapi/src/main/java/com/ningdatech/pmapi/sys/service/impl/RoleServiceImpl.java

@@ -19,6 +19,7 @@ import com.ningdatech.pmapi.sys.model.dto.RoleUpdateDTO;
 import com.ningdatech.pmapi.sys.model.entity.*;
 import com.ningdatech.pmapi.sys.service.*;
 import com.ningdatech.pmapi.sys.utils.AuthCacheKeyUtils;
+import com.ningdatech.pmapi.user.entity.enumeration.RoleEnum;
 import com.ningdatech.pmapi.user.manage.UserAuthManage;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -119,6 +120,7 @@ public class RoleServiceImpl extends ServiceImpl<RoleMapper, Role> implements IR
         Role role = BeanUtil.toBean(data, Role.class);
         role.setCreateBy(userId);
         role.setUpdateBy(userId);
+        role.setCode(RoleEnum.NORMAL_MEMBER.name());
         save(role);
         saveRoleMenu(data.getMenuIds(), role.getId());
         saveRoleMenuDatascope(data.getMenuDataScopeList(), role.getId());