Commit 418f8292 by 墨竹

fix:初始化修改

parent 9b5b2ce0
......@@ -32,6 +32,8 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.ArrayList;
import java.util.Date;
import java.util.List;
import java.util.Set;
import java.util.stream.Collectors;
@Service
public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
......@@ -356,16 +358,19 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
if (RoleClerkTypeEnum.CLERK.getCode().equals(clerkType)) {
List<String> menuList = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
List<String> codes = RolesListUtils.unionList(menuList, menuCodes);
Set<String> unionListcodes = codes.stream().collect(Collectors.toSet());
HaobanRoleMenuQDTO clerkMenus = new HaobanRoleMenuQDTO();
clerkMenus.setClerkType(clerkType);
clerkMenus.setMenuCodes(RolesListUtils.mergeList(menuList, menuCodes));
clerkMenus.setMenuCodes(unionListcodes.stream().collect(Collectors.toList()));
haobanRoleQDTO.setClerkMenus(clerkMenus);
haobanRoleSystemQDTO.setClerkMenus(clerkMenus);
} else if (RoleClerkTypeEnum.SHOP.getCode().equals(clerkType)) {
List<String> menuList = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
List<String> unionListcodes = RolesListUtils.unionList(menuList, menuCodes);
HaobanRoleMenuQDTO manegeClerkMenus = new HaobanRoleMenuQDTO();
manegeClerkMenus.setClerkType(clerkType);
manegeClerkMenus.setMenuCodes(RolesListUtils.mergeList(menuList, menuCodes));
manegeClerkMenus.setMenuCodes(unionListcodes.stream().collect(Collectors.toList()));
haobanRoleQDTO.setManegeClerkMenus(manegeClerkMenus);
haobanRoleSystemQDTO.setManegeClerkMenus(manegeClerkMenus);
} else if (RoleClerkTypeEnum.MANAGE.getCode().equals(clerkType)) {
......
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