Merge branch 'master' of http://114.55.67.98:8070/Natural_p1/zjugis_OA

zjugis-business/src/main/java/com/zjugis/business/flow/usemoney/service/UseMoneyServiceImpl.java

@@ -349,12 +349,14 @@ public class UseMoneyServiceImpl implements UseMoneyService {
                     List<UseMoneyDetailDO> detailList=useMoneyDetailService.getListByUseMoeneyId(useMoneyRespVO.getId());
                     String xmmc="";
                     for(UseMoneyDetailDO detail:detailList){
-                        Project projectList = projectService.selectById(detail.getProjectId());
-                        if(projectList!=null){
-                            xmmc+="，"+projectList.getXmmc();
+                        if(detail.getProjectId()!=null){
+                            Project projectList = projectService.selectById(detail.getProjectId());
+                            if(projectList!=null){
+                                xmmc+="，"+projectList.getXmmc();
+                            }
                         }
                     }
-                    useMoneyRespVO.setProjectName(xmmc.substring(1));
+                    useMoneyRespVO.setProjectName(xmmc.length() > 1 ? xmmc.substring(1) : xmmc);
                 }
                 Integer flowStatus = useMoneyRespVO.getFlowStatus();
                 if (FLOW_FINISHED == flowStatus) {
@@ -867,7 +869,7 @@ public class UseMoneyServiceImpl implements UseMoneyService {
                         }
                     }
                 }
-                useMoneyRespVO.setProjectName(xmmc.substring(1));
+                useMoneyRespVO.setProjectName(xmmc.length() > 1 ? xmmc.substring(1) : xmmc);
             }
             Integer flowStatus = useMoneyRespVO.getFlowStatus();
             if (FLOW_FINISHED == flowStatus) {