Skip to content

Y
yanxuan-qc-change-system
Commit ae76e816 by 穆龙飞
Options

modify:修改三级部门判断条件

parent 486a483e
Showing with 4 additions and 4 deletions
yanxuan-qc-change-system-biz/src/main/java/com/netease/mail/yanxuan/change/biz/biz/ChangeFlowBiz.java
...@@ -829,7 +829,7 @@ public class ChangeFlowBiz { ...@@ -829,7 +829,7 @@ public class ChangeFlowBiz {
List<SecondaryDepartments> commander = orgMap.get(changeRecord.getChangeCommander()); List<SecondaryDepartments> commander = orgMap.get(changeRecord.getChangeCommander());
List<SecondaryDepartments> creator = orgMap.get(changeRecord.getCreator()); List<SecondaryDepartments> creator = orgMap.get(changeRecord.getCreator());
if (!CollectionUtils.isEmpty(commander)) { if (!CollectionUtils.isEmpty(commander)) {
Optional<SecondaryDepartments> anyOrg = commander.stream().filter(o -> o.getOrgPosLevel() == 3).findAny(); Optional<SecondaryDepartments> anyOrg = commander.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
String orgName = "无三级部门"; String orgName = "无三级部门";
if (anyOrg.isPresent()) { if (anyOrg.isPresent()) {
orgName = anyOrg.get().getOrgPosName(); orgName = anyOrg.get().getOrgPosName();
...@@ -837,7 +837,7 @@ public class ChangeFlowBiz { ...@@ -837,7 +837,7 @@ public class ChangeFlowBiz {
changeFlowVO.setChangeCommanderView(commander.get(0).getUserName() + "(" + orgName + ")"); changeFlowVO.setChangeCommanderView(commander.get(0).getUserName() + "(" + orgName + ")");
} }
if (!CollectionUtils.isEmpty(creator)) { if (!CollectionUtils.isEmpty(creator)) {
Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 3).findAny(); Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
String orgName = "无三级部门"; String orgName = "无三级部门";
if (anyOrg.isPresent()) { if (anyOrg.isPresent()) {
orgName = anyOrg.get().getOrgPosName(); orgName = anyOrg.get().getOrgPosName();
...@@ -911,7 +911,7 @@ public class ChangeFlowBiz { ...@@ -911,7 +911,7 @@ public class ChangeFlowBiz {
//Optional<IusUserInfoRsp> commander = data.stream().filter(u -> u.getUid().equals(i.getChangeCommander())).findAny(); //Optional<IusUserInfoRsp> commander = data.stream().filter(u -> u.getUid().equals(i.getChangeCommander())).findAny();
//Optional<IusUserInfoRsp> creator = data.stream().filter(u -> u.getUid().equals(i.getChangeCreator())).findAny(); //Optional<IusUserInfoRsp> creator = data.stream().filter(u -> u.getUid().equals(i.getChangeCreator())).findAny();
if (!CollectionUtils.isEmpty(commander)) { if (!CollectionUtils.isEmpty(commander)) {
Optional<SecondaryDepartments> anyOrg = commander.stream().filter(o -> o.getOrgPosLevel() == 3).findAny(); Optional<SecondaryDepartments> anyOrg = commander.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
String orgName = "无三级部门"; String orgName = "无三级部门";
if (anyOrg.isPresent()) { if (anyOrg.isPresent()) {
orgName = anyOrg.get().getOrgPosName(); orgName = anyOrg.get().getOrgPosName();
...@@ -919,7 +919,7 @@ public class ChangeFlowBiz { ...@@ -919,7 +919,7 @@ public class ChangeFlowBiz {
i.setChangeCommander(commander.get(0).getUserName() + "(" + orgName + ")"); i.setChangeCommander(commander.get(0).getUserName() + "(" + orgName + ")");
} }
if (!CollectionUtils.isEmpty(creator)) { if (!CollectionUtils.isEmpty(creator)) {
Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 3).findAny(); Optional<SecondaryDepartments> anyOrg = creator.stream().filter(o -> o.getOrgPosLevel() == 97).findAny();
String orgName = "无三级部门"; String orgName = "无三级部门";
if (anyOrg.isPresent()) { if (anyOrg.isPresent()) {
orgName = anyOrg.get().getOrgPosName(); orgName = anyOrg.get().getOrgPosName();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment