fix:网格平台登录对接调整

xusd

2024-10-17 adddb6522e95c08bef6bc6b00338ff27d82aa55d

fix:网格平台登录对接调整

 dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java

@@ -83,9 +83,8 @@
        if (userRoleList.getCode() == R.SUCCESS) {
            List<GridUserRoleDTO> data = userRoleList.getData();
            for (GridUserRoleDTO item : data) {
                if (item.isLastOrgRole()) {
                if (item.getRoleName().contains("矛调系统")) {
                    BeanUtils.copyProperties(item, roleDTO);
                    break;
                }
            }
        }
@@ -108,7 +107,7 @@
                if ("矛盾纠纷化解子系统".equals(name)) {
                    List<GridRoleMenuDTO> children = data.get(0).getChildren();

                }else {
                } else {

                }
                ctUserole.setRoleId("22_00024-4");

 dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java

@@ -439,25 +439,26 @@
        GridUserRoleVo gridUserRoleVo = new GridUserRoleVo();
        gridUserRoleVo.setUserId(userId);
        GridUserRoleDTO userRoleDTO = sysClient.getUserRoleList(gridUserRoleVo);
        if (StringUtils.isEmpty(userRoleDTO.getOrgName())) {
            return ReturnFailUtils.getRepInfo("用户不存在！，请确认后重试！");
        if (StringUtils.isEmpty(userRoleDTO.getRoleName()) || !userRoleDTO.getRoleName().contains("矛调系统")) {
            return ReturnFailUtils.getRepInfo("该用户没有矛调系统的权限");
        }
        if (StringUtils.isNotEmpty(userRoleDTO.getOrgName()) && userRoleDTO.getOrgName().endsWith("网格")) {
            return ReturnFailUtils.getRepInfo("该用户所在机构禁止登录矛调系统，请切换该用户机构为区、镇街、社区机构");
        }
        //拿到用户角色菜单权限信息
        GridRoleMenuVo gridRoleMenuVo = new GridRoleMenuVo();
        gridRoleMenuVo.setOrgRoleId(userRoleDTO.getOrgRoleId());
        gridRoleMenuVo.setMenuSys("sub-mdjfhj");
        CtUserole roleMenu = sysClient.getRoleMenu(gridRoleMenuVo);
        if (roleMenu == null || StringUtils.isEmpty(roleMenu.getRoleId())) {
            return ReturnFailUtils.getRepInfo("该用户没有矛调系统的权限");
        CtUserole ctUserole = new CtUserole();
        if (userRoleDTO.getRoleName().contains("纷化解人员")) {
            ctUserole.setRoleId("22_00024-4");
            ctUserole.setRoleName("纠纷化解人员");
        } else {
            ctUserole.setRoleId("22_00024-3");
            ctUserole.setRoleName("单位管理员");
        }

        List<CtUserole> ctUseroles = new ArrayList<>();
        ctUseroles.add(roleMenu);
        log.info("xsd:roleMenu:{}", roleMenu);
        ctUseroles.add(ctUserole);
        log.info("xsd:CtUserole:{}", ctUserole);
        CtUnit ctUnit = ctUnitService.selectUnitByGridId(userRoleDTO.getOrgId());
        log.info("xsd:newuser:{}", ctUnit);
        log.info("xsd:ctUnit:{}", ctUnit);
        if (ctUnit != null && StringUtils.isNotEmpty(ctUnit.getId())) {
            CtUserSaveDTO ctUserSaveDTO = new CtUserSaveDTO();
            ctUserSaveDTO.setUnitId(ctUnit.getId());
@@ -471,7 +472,7 @@
            ctUserService.webSaveCtUser(ctUserSaveDTO, "-1");
            log.info("xsd:ctUserSaveDTO:{}", ctUserSaveDTO);
        } else {
            return ReturnFailUtils.getRepInfo("该用户所属机构不允许登录矛调系统！请调整机构后重试！");
            return ReturnFailUtils.getRepInfo("该用户所在机构禁止登录矛调系统！请调整机构后重试！");
        }
        return ReturnSucUtils.getRepInfo("创建账号成功");
    }