|
@@ -125,6 +125,19 @@ public class TParticipantFilterController extends BaseController {
|
|
|
map.put("participantTypeSecondaryUserText", participantTypeSecondaryUserText);
|
|
|
map.put("participantTypeSecondaryUserJSON", JSON.toJSONString(participantTypeSecondaryUser));
|
|
|
break;
|
|
|
+ case ASSIGN_USER_DEPT_LEADER://指定用户所在部门的分管领导
|
|
|
+ //参与人类型指定次级指定用户
|
|
|
+ String participantTypeSecondaryUserText2 = "请选择";
|
|
|
+ Select[] participantTypeSecondaryUser2 = Selects.getParticipantTypeSecondaryUser();
|
|
|
+ for (Select select : participantTypeSecondaryUser2) {
|
|
|
+ if (select.getValue().equals(filterEntity.getParticipantTypeSecondary())) {
|
|
|
+ participantTypeSecondaryUserText2 = select.getText();
|
|
|
+ break;
|
|
|
+ }
|
|
|
+ }
|
|
|
+ map.put("participantTypeSecondaryUserText", participantTypeSecondaryUserText2);
|
|
|
+ map.put("participantTypeSecondaryUserJSON", JSON.toJSONString(participantTypeSecondaryUser2));
|
|
|
+ break;
|
|
|
default:
|
|
|
break;
|
|
|
}
|
|
@@ -288,6 +301,7 @@ public class TParticipantFilterController extends BaseController {
|
|
|
case ASSIGN_USER_DEPT://指定用户所在部门
|
|
|
case ASSIGN_USER_POSITION://指定用户所在职位
|
|
|
case ASSIGN_USER_ROLE://指定用户所在角色
|
|
|
+ case ASSIGN_USER_DEPT_LEADER://指定用户所在部门的分管领导
|
|
|
case ASSIGN_USER_LEADER://指定用户的分管领导
|
|
|
if (Objects.isNull(participantTypeSecondaryUser)) {
|
|
|
participantTypeSecondaryUser = Selects.getParticipantTypeSecondaryUser();
|