java/zhihuishenqu.git

			@@ -377,6 +377,7 @@
			loginUserInfoVO.setIsCommunityWorker(2);
			loginUserInfoVO.setIsPropertyWorker(2);
			loginUserInfoVO.setIsSocialWorker(2);
			loginUserInfoVO.setIsFmsMember(2);
			// 志愿者状态
			String phone = sysUserDO.getPhone();
			Long userCommunityId = sysUserDO.getCommunityId();
			@@ -410,6 +411,11 @@
			int countPropertyWorker = userDao.countPropertyWorker(Long.parseLong(userId), userCommunityId);
			if (countPropertyWorker > 0) {
			loginUserInfoVO.setIsPropertyWorker(1);
			}
			//是否微团队成员
			int countFmsMember = userDao.countFmsMember(phone, userCommunityId);
			if (countFmsMember > 0) {
			loginUserInfoVO.setIsFmsMember(1);
			}
			// 是否是"管理员"或者本社区 "社区团队"、"党委成员"
			Integer countTeam = userDao.selectCountTeam(phone, userCommunityId);
			@@ -713,6 +719,9 @@
			//是否是社区物业人员
			int countPropertyWorker = userDao.countPropertyWorker(userId, loginUserInfoVO.getCommunityId());
			loginUserInfoVO.setIsPropertyWorker(countPropertyWorker > 0 ? 1 : 0);
			//是否微团队成员
			int countFmsMember = userDao.countFmsMember(loginUserInfoVO.getPhone(), loginUserInfoVO.getCommunityId());
			loginUserInfoVO.setIsFmsMember(countFmsMember > 0 ? 1 : 0);
			loginUserInfoVO.setIdCard(SensitiveUtil.desensitizedIdNumber(loginUserInfoVO.getIdCard()));
			loginUserInfoVO.setPhone(SensitiveUtil.desensitizedPhoneNumber(loginUserInfoVO.getPhone()));
			//判断账号类型
			@@ -1159,6 +1168,9 @@
			menu.add(233L);
			menu.add(237L);
			}
			else {
			menuRoleVO.setIsAll(1);
			}
			menuRoleVO.setMenuIds(menu);
			menuRoleVO.setRoleId(roleId);
			this.putMenuRole(menuRoleVO);
			@@ -1237,25 +1249,23 @@
			List<Long> menu=new ArrayList<>();
			if(administratorsUserVO.getSocialType()==1){
			sysRoleDO.setRoleKey(Constants.STREET_ROLE_KEY + administratorsUserVO.getStreetId());
			menu.add(233L);
			menu.add(234L);
			menu.add(235L);
			menu.add(236L);
			menu.add(237L);
			menu.add(300L);
			menu.add(301L);
			menu.add(302L);
			menu.add(303L);
			menu.add(304L);
			}
			else if(administratorsUserVO.getSocialType()==2){
			sysRoleDO.setRoleKey("social_org" + administratorsUserVO.getStreetId());
			menu.add(233L);
			menu.add(76L);
			menu.add(234L);
			menu.add(236L);
			menu.add(237L);
			menu.add(238L);
			menu.add(300L);
			menu.add(301L);
			menu.add(302L);
			menu.add(303L);
			}
			else if(administratorsUserVO.getSocialType()==3){
			sysRoleDO.setRoleKey("social_org_member" + administratorsUserVO.getStreetId());
			menu.add(233L);
			menu.add(237L);
			menu.add(300L);
			menu.add(303L);
			}

			sysRoleDO.setRoleSort(0);
			@@ -1270,7 +1280,7 @@
			// 新街道管理员角色设置固定三社权限
			MenuRoleVO menuRoleVO = new MenuRoleVO();
			menuRoleVO.setMenuIds(menu);
			menuRoleVO.setRoleId(roleId);
			menuRoleVO.setRoleId(sysRoleDO.getRoleId());
			this.putMenuRole(menuRoleVO);
			}
			}
			@@ -1370,7 +1380,7 @@
			.anyMatch(sysRoleMenuDO -> sysRoleMenuDO.getMenuId().equals(menuId))).collect(Collectors.toList());
			}
			if (!menuIds.isEmpty()) {
			if(menuRoleVO.getMenuIds().isEmpty()){
			if(menuRoleVO.getMenuIds()==null){
			sysRoleMenuDAO.batchInsertWithRoleId(menuIds, roleId);
			}
			else {
			@@ -2935,6 +2945,14 @@
			return R.ok(loginUserInfoVO);
			}

			@Override
			public R updateStreetId(AdministratorsUserVO administratorsUserVO) {
			SysUserDO sysUserDO=new SysUserDO();
			BeanUtils.copyProperties(administratorsUserVO,sysUserDO);
			userDao.updateById(sysUserDO);
			return R.ok();
			}

			/**
			* 微商业街新增商家账号
			* @param mcsMerchantDTO