|
|
@@ -307,7 +307,7 @@ public class ActivitiService {
|
|
|
//不获取集中评审的待办任务 select distinct NAME_ from ACT_RU_TASK;
|
|
|
List<String> allTaskNameExceptConcentrate = Arrays.asList("二级单位分办", "二级单位初审", "二级单位复审", "二级单位审核",
|
|
|
"业务处室接收", "业务处室专业审批", "专业审批", "专业处室分办", "交费", "企管法规处入库", "企管法规处审批", "企业法规处审批",
|
|
|
- "企管法规处编号、入库", "审批未通过", "审核未通过", "待开发票");
|
|
|
+ "企管法规处审核", "企管法规处编号、入库", "审批未通过", "审核未通过", "待开发票");
|
|
|
taskQuery = taskQuery.taskNameIn(allTaskNameExceptConcentrate);
|
|
|
long taskTotal = taskQuery.count();
|
|
|
|
|
|
@@ -554,7 +554,7 @@ public class ActivitiService {
|
|
|
historicTask.setRemarks(hvi.getValue().toString());
|
|
|
|
|
|
} else if( hvi.getVariableName().equals("users")) {
|
|
|
- if (!hvi.getValue().toString().equals("")) {
|
|
|
+ if (!StringUtils.isEmpty(hvi.getValue().toString()) && StringUtils.isEmpty(historicTask.getUsers())) {
|
|
|
historicTask.setUsers(hvi.getValue().toString());
|
|
|
}
|
|
|
} else if( hvi.getVariableName().equals("orgName")) {
|
baichengfei