提交

CODE/smart-community/app-api/src/main/java/com/community/huiju/service/impl/WxLoginServiceImpl.java

@@ -29,6 +29,7 @@ import org.springframework.web.client.RestTemplate;
 
 import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpSession;
+import java.io.UnsupportedEncodingException;
 import java.net.URLDecoder;
 import java.net.URLEncoder;
 import java.util.Date;
@@ -144,9 +145,16 @@ public class WxLoginServiceImpl implements WxLoginServiceI {
 		if (StringUtils.isBlank(openid)) {
 			throw new WisdomException("openid 参数缺失！");
 		}
+		String nickname = jsonObject.getString("nickname");
+		try {
+			nickname = new String(nickname.getBytes("ISO-8859-1"), "UTF-8");
+			logger.info("解决微信昵称乱码后的昵称：{}", nickname);
+		} catch (UnsupportedEncodingException e) {
+			e.printStackTrace();
+		}
 
 		user.setOpenid(openid);
-		user.setNickname(jsonObject.getString("nickname"));
+		user.setNickname(nickname);
 
 		// 更新用户信息
 		taUserMapper.updateByPrimaryKeySelective(user);

CODE/smart-community/property-api/src/main/java/com/community/huiju/service/impl/SysMenuServiceImpl.java

@@ -1,6 +1,7 @@
 package com.community.huiju.service.impl;
 
 
+import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import com.community.commom.mode.ResponseBean;
 import com.community.commom.session.UserElement;
@@ -37,7 +38,9 @@ public class SysMenuServiceImpl extends ServiceImpl<SysMenuMapper, SysMenu> impl
 	@Override
 	public ResponseBean getMenuList(UserElement userElement) {
 		ResponseBean responseBean = new ResponseBean();
-		List<SysMenu> sysMenuList = sysMenuMapper.selectList(null);
+		QueryWrapper<SysMenu> sysMenuQueryWrapper = new QueryWrapper<>();
+		sysMenuQueryWrapper.ne("status", "9");
+		List<SysMenu> sysMenuList = sysMenuMapper.selectList(sysMenuQueryWrapper);
 		List<SysMenu> menuList = new ArrayList<SysMenu>();
 		sysMenuList.stream().forEach(sysMenu -> {
 			//父节点是0的，为根节点。

VUECODE/smart-property-manage/src/router/index.js

@@ -47,14 +47,14 @@ export const constantRouterMap = [
         path: '/building/index',
         component: () => import('@/views/building/index'),
         name: 'building-index',
-        meta: { title: '楼栋业主资料库', icon: 'building' }
+        meta: { title: '业主资料库', icon: 'building' }
       },
       {
         path: '/building/info/index',
         component: () => import('@/views/building/info/index'),
         name: 'building-info-index',
         hidden: true,
-        meta: { title: '楼栋业主资料库详情', icon: 'building' }
+        meta: { title: '业主资料库详情', icon: 'building' }
       },
       {
         path: '/building/buildingdata/edibuildingdata',
@@ -63,12 +63,12 @@ export const constantRouterMap = [
         hidden: true,
         meta: { title: '小区楼栋添加节点', icon: 'building' }
       },
-      {
-        path: '/owner/index',
-        component: () => import('@/views/owner/index'),
-        name: 'owner-index',
-        meta: { title: '已认证业主', icon: 'building' }
-      },
+      // {
+      //   path: '/owner/index',
+      //   component: () => import('@/views/owner/index'),
+      //   name: 'owner-index',
+      //   meta: { title: '已认证业主', icon: 'building' }
+      // },
       {
         path: '/building/batch',
         component: () => import('@/views/building/batch/batchImport'),