Merge remote-tracking branch 'origin/dev_bugfix_ljj' into dev_bugfix_ljj

epmet-module/gov-org/gov-org-server/src/main/java/com/epmet/service/impl/StaffServiceImpl.java

@@ -519,7 +519,7 @@ public class StaffServiceImpl implements StaffService {
 
 		//2.调用user服务，新增用户信息
 		StaffSubmitFromDTO submitDTO = ConvertUtils.sourceToTarget(fromDTO, StaffSubmitFromDTO.class);
-		submitDTO.setAgencyId(fromDTO.getOrgId());
+		submitDTO.setAgencyId(orgDTO.getAgencyId());
 		Result<CustomerStaffDTO> result = epmetUserFeignClient.addStaff(submitDTO);
 		if (!result.success()) {
 			if (result.getCode() != EpmetErrorCode.SERVER_ERROR.getCode()) {

epmet-module/gov-project/gov-project-server/src/main/java/com/epmet/service/impl/ProjectSatisfactionStatisticsServiceImpl.java

@@ -140,8 +140,8 @@ public class ProjectSatisfactionStatisticsServiceImpl extends BaseServiceImpl<Pr
     @Override
     public ProjectEvaluateScoreResultDTO projectEvaluateScore(ProjectEvaluateScoreFormDTO formDTO) {
         ProjectEntity projectEntity = projectDao.selectById(formDTO.getProjectId());
-        if (projectEntity.getOrigin().equals(ProjectConstant.AGENCY)){
-            // 直接立项的项目不能评价，所以给0分
+        if (!projectEntity.getOrigin().equals(ProjectConstant.ISSUE)){
+            // 直接立项的项目不能评价，报事不能评价,所以给0分
             return new ProjectEvaluateScoreResultDTO(NumConstant.EIGHTY);
         }
         ProjectSatisfactionStatisticsEntity entity = baseDao.selectInfoByProjectId(formDTO.getProjectId());