Merge branch 'version_performance_2.0' of http://gitlab.ldxinyong.com/enterpriseManagement/lz_management into version_performance_2.0
This commit is contained in:
commit
19c1647992
@ -69,7 +69,7 @@ public class ShiroConfig {
|
|||||||
filterMap.put("/dtlg/jump", "anon");
|
filterMap.put("/dtlg/jump", "anon");
|
||||||
filterMap.put("/luck/getLuckById", "anon");
|
filterMap.put("/luck/getLuckById", "anon");
|
||||||
filterMap.put("/luck/updateLuck", "anon");
|
filterMap.put("/luck/updateLuck", "anon");
|
||||||
filterMap.put("/**", "anon");
|
filterMap.put("/**", "oauth2");
|
||||||
shiroFilter.setFilterChainDefinitionMap(filterMap);
|
shiroFilter.setFilterChainDefinitionMap(filterMap);
|
||||||
|
|
||||||
return shiroFilter;
|
return shiroFilter;
|
||||||
|
|||||||
@ -215,6 +215,7 @@ public class FlowStartServiceImpl extends ServiceImpl<FlowStartMapper, FlowStart
|
|||||||
flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入
|
flowStart1.setGroupIds(ids1.stream().collect(Collectors.joining(",")));//把新的组信息加入
|
||||||
updateById(flowStart1);//更新组信息到记录里面
|
updateById(flowStart1);//更新组信息到记录里面
|
||||||
|
|
||||||
|
flowStart.setGroupIds(ids.stream().collect(Collectors.joining(",")));//过滤后的考核组
|
||||||
flowStart.setId(flowStart1.getId());
|
flowStart.setId(flowStart1.getId());
|
||||||
flowStart.setIsDelete(flowStart1.getIsDelete());
|
flowStart.setIsDelete(flowStart1.getIsDelete());
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user