管理后台首页修改

kmall-admin/src/main/webapp/index.html

@@ -31,10 +31,9 @@
             <ul class="nav" id="side-menu">
                 <li class="nav-header">
                     <div class="dropdown profile-element"
-                         style="text-align: center;font-size: 18px;font-weight: 600;color: white;">
-                        中网管理后台
+                         style="text-align: center;font-size: 18px;font-weight: 600;color: white;">{{user.roleType == 1 ? '中网管理后台':''}}{{user.roleType == 2 ? store.storeName:''}}{{user.roleType == 3 ? user.merchName:''}}
                     </div>
-                    <div class="logo-element">ZW
+                    <div class="logo-element">{{user.username}}
                     </div>
                 </li>
                 <menu-item :item="item" v-for="item in menuList"></menu-item>
@@ -258,6 +257,9 @@
 <script src="statics/plugins/slimscroll/jquery.slimscroll.min.js"></script>
 <script src="js/common.js"></script>
 <script>
+    $(function () {
+        vm.getUser();
+    });
     //生成菜单
     var menuItem = Vue.extend({
         name: 'menu-item',
@@ -285,7 +287,8 @@
             password: '',
             newPassword: '',
             menuList: {},
-            user: {}
+            user: {},
+            store: {}
         },
         methods: {
             getMenuList: function (event) {
@@ -296,6 +299,16 @@
             getUser: function () {
                 $.getJSON("sys/user/info?_" + $.now(), function (r) {
                     vm.user = r.user;
+                    console.log(r.user.merchSn);
+                    console.log(r.user.merchName);
+                    if(r.user.storeId){
+                        vm.getStore(r.user.storeId);
+                    }
+                });
+            },
+            getStore: function (id) {
+                $.get("store/info/" + id, function (r) {
+                    vm.store = r.store;
                 });
             },
             updatePassword: function () {

kmall-common/src/main/java/com/kmall/common/controller/SysUserController.java

@@ -63,7 +63,9 @@ public class SysUserController extends AbstractController {
      */
     @RequestMapping("/info")
     public R info() {
-        return R.ok().put("user", getUser());
+        SysUserEntity userEntity = getUser();
+        userEntity = sysUserService.queryObject(userEntity.getUserId());
+        return R.ok().put("user", userEntity);
     }
 
     /**

kmall-common/src/main/java/com/kmall/common/entity/SysUserEntity.java

@@ -82,10 +82,20 @@ public class SysUserEntity
 
     private String merchSn;
 
+    private String merchName;
+
     private String roleType;
 
     private Set<String> permsSet;
 
+    public String getMerchName() {
+        return merchName;
+    }
+
+    public void setMerchName(String merchName) {
+        this.merchName = merchName;
+    }
+
     /**
      * 设置：
      *

kmall-common/src/main/resources/mybatis/mapper/SysUserDao.xml

@@ -4,10 +4,11 @@
 <mapper namespace="com.kmall.common.dao.SysUserDao">
 	<select id="queryObject" resultType="com.kmall.common.entity.SysUserEntity">
 		SELECT
-		u.*, ( SELECT d.NAME FROM sys_dept d WHERE d.dept_id = u.dept_id ) deptName, ur.role_id
+		u.*, ( SELECT d.NAME FROM sys_dept d WHERE d.dept_id = u.dept_id ) deptName, ur.role_id,m.merch_name merchName
 		FROM
 		sys_user u
 		LEFT JOIN sys_user_role ur ON u.user_id = ur.user_id
+		left join mall_merch m on m.merch_sn = u.merch_sn
 		where u.user_id = #{value}
 	</select>