|
|
@@ -1870,7 +1870,7 @@ public class FlowServiceImpl implements FlowService {
|
|
|
SystemGroup group = bpmSystemDao.getSystemGroupById(groupid);
|
|
|
// 取部门主管,没有则提示错误
|
|
|
String person = group.getPerson();
|
|
|
- if ("0".equals(person) || "null".equals(person) || "".equals(person)) {
|
|
|
+ if ("0".equals(person) || "null".equals(person) || "".equals(person) || person == null) {
|
|
|
throw new RuntimeException(ProcessDefine.FLOW_ERROR_13);
|
|
|
}
|
|
|
List<GroupXUser> list = treeUtilDao.loadGroupXuser(person);
|
|
|
@@ -1899,7 +1899,7 @@ public class FlowServiceImpl implements FlowService {
|
|
|
// 取上级部门
|
|
|
SystemGroup pGroup = bpmSystemDao.getSystemGroupById(pid);
|
|
|
String person = pGroup.getPerson();
|
|
|
- if ("0".equals(person) || "null".equals(person) || "".equals(person)) {
|
|
|
+ if ("0".equals(person) || "null".equals(person) || "".equals(person) || person == null) {
|
|
|
throw new RuntimeException(ProcessDefine.FLOW_ERROR_13);
|
|
|
}
|
|
|
List<GroupXUser> list = treeUtilDao.loadGroupXuser(person);
|
|
|
@@ -1923,7 +1923,7 @@ public class FlowServiceImpl implements FlowService {
|
|
|
SystemGroup group = bpmSystemDao.getSystemGroupById(groupId);
|
|
|
// 取部门主管,没有则提示错误
|
|
|
String person = group.getPerson();
|
|
|
- if ("0".equals(person) || "null".equals(person) || "".equals(person)) {
|
|
|
+ if ("0".equals(person) || "null".equals(person) || "".equals(person) || person == null) {
|
|
|
throw new RuntimeException(ProcessDefine.FLOW_ERROR_13);
|
|
|
}
|
|
|
List<GroupXUser> list = treeUtilDao.loadGroupXuser(person);
|
|
|
@@ -1954,7 +1954,7 @@ public class FlowServiceImpl implements FlowService {
|
|
|
// 取上级部门
|
|
|
SystemGroup pGroup = bpmSystemDao.getSystemGroupById(pid);
|
|
|
String person = pGroup.getPerson();
|
|
|
- if ("0".equals(person) || "null".equals(person) || "".equals(person)) {
|
|
|
+ if ("0".equals(person) || "null".equals(person) || "".equals(person) || person == null) {
|
|
|
throw new RuntimeException(ProcessDefine.FLOW_ERROR_13);
|
|
|
}
|
|
|
List<GroupXUser> list = treeUtilDao.loadGroupXuser(person);
|