|
@@ -1515,7 +1515,7 @@ public class WorkFullManageController extends BaseController {
|
|
|
if (workActivityProcesses.size()!=0){
|
|
|
WorkActivityProcess workActivityProcess=workActivityProcesses.get(0);
|
|
|
if (null!=workActivityProcess){
|
|
|
- String str=workActivityProcess.getRemarks().split("]")[1];
|
|
|
+ String str=workActivityProcess.getRemarks().split("]",2)[1];
|
|
|
data.put("signRemarks",str);
|
|
|
}else{
|
|
|
data.put("signRemarks","");
|
|
@@ -1523,9 +1523,13 @@ public class WorkFullManageController extends BaseController {
|
|
|
}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","");
|
|
|
}
|