Merge remote-tracking branch 'origin/master'

# Conflicts:
#	src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

src/main/java/com/jeeplus/modules/workfullmanage/web/WorkFullManageController.java

@@ -1515,17 +1515,21 @@ public class WorkFullManageController extends BaseController {
 		if (workActivityProcesses.size()!=0){
 			WorkActivityProcess workActivityProcess=workActivityProcesses.get(0);
 			if (null!=workActivityProcess){
-				String[] split = workActivityProcess.getRemarks().split("]",2);
-				data.put("signRemarks",split[1]);
+				String str=workActivityProcess.getRemarks().split("]",2)[1];
+				data.put("signRemarks",str);
 			}else{
 				data.put("signRemarks","");
 			}
 		}else{
 			data.put("signRemarks","");
 		}
-		User user1=UserUtils.get(projectReportDataTwo.getBzshbUserId());
-		if (StringUtils.isNotBlank(user1.getName())){
-			data.put("signName",user1.getName());
+		if (projectReportDataTwo.getStatus().equals("5")){
+			User user1=UserUtils.get(projectReportDataTwo.getBzshbUserId());
+			if (StringUtils.isNotBlank(user1.getName())){
+				data.put("signName",user1.getName());
+			}else{
+				data.put("signName","");
+			}
 		}else{
 			data.put("signName","");
 		}