~huangh/gz-dyh.git

			@@ -99,15 +99,20 @@
			public CtUserole getRoleMenu(GridRoleMenuVo gridRoleMenuVo) {
			//需要等所有菜单权限确认后再编写后续逻辑
			CtUserole ctUserole = new CtUserole();
			ctUserole.setRoleId("22_00024-4");
			ctUserole.setRoleName("纠纷化解人员");

			R<List<GridRoleMenuDTO>> roleMenu = sysClient.getRoleMenu(gridRoleMenuVo);
			if (roleMenu.getCode() == R.SUCCESS) {
			List<GridRoleMenuDTO> data = roleMenu.getData();
			String name = data.get(0).getName();
			if("矛盾纠纷化解子系统".equals(name)){
			List<GridRoleMenuDTO> children = data.get(0).getChildren();
			if (data.size() > 0) {
			String name = data.get(0).getName();
			if ("矛盾纠纷化解子系统".equals(name)) {
			List<GridRoleMenuDTO> children = data.get(0).getChildren();

			}else {

			}
			ctUserole.setRoleId("22_00024-4");
			ctUserole.setRoleName("纠纷化解人员");
			}
			}
			return ctUserole;

			@@ -452,9 +452,14 @@
			gridRoleMenuVo.setOrgRoleId(userRoleDTO.getRoleId());
			gridRoleMenuVo.setMenuSys("sub-mdjfhj");
			CtUserole roleMenu = sysClient.getRoleMenu(gridRoleMenuVo);
			if (roleMenu == null \|\| StringUtils.isEmpty(roleMenu.getRoleId())) {
			return ReturnFailUtils.getRepInfo("该用户没有矛调系统的权限");
			}
			List<CtUserole> ctUseroles = new ArrayList<>();
			ctUseroles.add(roleMenu);
			log.info("xsd:roleMenu:{}", roleMenu);
			CtUnit ctUnit = ctUnitService.selectUnitByGridId(userRoleDTO.getOrgId());
			log.info("xsd:newuser:{}", ctUnit);
			if (ctUnit != null && StringUtils.isNotEmpty(ctUnit.getId())) {
			CtUserSaveDTO ctUserSaveDTO = new CtUserSaveDTO();
			ctUserSaveDTO.setUnitId(ctUnit.getId());
			@@ -466,9 +471,9 @@
			ctUserSaveDTO.setIdcard(gridUserBaseDTO.getIdNumber());
			ctUserSaveDTO.setCtUseroleList(ctUseroles);
			ctUserService.webSaveCtUser(ctUserSaveDTO, "-1");

			log.info("xsd:ctUserSaveDTO:{}", ctUserSaveDTO);
			} else {
			return ReturnFailUtils.getRepInfo("用户不存在！，请确认后重试！");
			return ReturnFailUtils.getRepInfo("该用户所属机构不允许登录矛调系统！请调整机构后重试！");
			}
			return ReturnSucUtils.getRepInfo("创建账号成功");
			}

	dyh-service/dyh-cust/src/main/java/cn/huge/module/client/api/impl/SysClientImpl.java	15 ●●●●● patch \| view \| raw \| blame \| history
	dyh-service/dyh-cust/src/main/java/cn/huge/module/ctuser/service/CtAccountService.java	9 ●●●●● patch \| view \| raw \| blame \| history