Commit 9b5b2ce0 by 墨竹

fix:初始化修改

parent d37cb5df
......@@ -5,6 +5,7 @@ import com.gic.commons.util.EntityUtil;
import com.gic.commons.util.UniqueIdUtils;
import com.gic.haoban.app.customer.service.api.service.ManageSettingApiService;
import com.gic.haoban.base.api.common.pojo.dto.WebLoginDTO;
import com.gic.haoban.common.utils.RolesListUtils;
import com.gic.haoban.manage.api.dto.ClerkEditInfoDTO;
import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleMenuQDTO;
import com.gic.haoban.manage.api.dto.qdto.role.HaobanRoleQDTO;
......@@ -331,6 +332,7 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
menuCodes.add("workbench");
menuCodes.add("userCenter");
menuCodes.add("dataSummary");
//导购和店长初始化权限以好办web为准
List<String> menuCodesOld = applicationSettingApiService.findMenuCodes(wxEnterpriseId);
List<String> clerkMenuCodes = haobanMenuService.getHaobanMenuByPid(menuCodesOld);
......@@ -353,15 +355,17 @@ public class HaobanRoleApiServiceImpl implements HaobanRoleApiService {
haobanRoleSystemQDTO.setSystemFlag(0);
if (RoleClerkTypeEnum.CLERK.getCode().equals(clerkType)) {
List<String> menuList = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
HaobanRoleMenuQDTO clerkMenus = new HaobanRoleMenuQDTO();
clerkMenus.setClerkType(clerkType);
clerkMenus.setMenuCodes(menuCodes);
clerkMenus.setMenuCodes(RolesListUtils.mergeList(menuList, menuCodes));
haobanRoleQDTO.setClerkMenus(clerkMenus);
haobanRoleSystemQDTO.setClerkMenus(clerkMenus);
} else if (RoleClerkTypeEnum.SHOP.getCode().equals(clerkType)) {
List<String> menuList = haobanRoleMenuService.getByWxEnterpriseIdAndRoleId("-1", roleId);
HaobanRoleMenuQDTO manegeClerkMenus = new HaobanRoleMenuQDTO();
manegeClerkMenus.setClerkType(clerkType);
manegeClerkMenus.setMenuCodes(menuCodes);
manegeClerkMenus.setMenuCodes(RolesListUtils.mergeList(menuList, menuCodes));
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