Merge branch 'master' of zj/kmall-pt into master

kmall-admin/src/main/java/com/kmall/admin/controller/StoreController.java

@@ -111,4 +111,15 @@ public class StoreController {
 
         return R.ok().put("list", list);
     }
+
+
+    /**
+     * 查看所有列表
+     */
+    @RequestMapping("/getStoresByMerch")
+    @ResponseBody
+    public R getStoresByMerch(@RequestParam Map<String, Object> params) {
+        List<StoreEntity> list = storeService.queryList(params);
+        return R.ok().put("list", list);
+    }
 }

kmall-admin/src/main/java/com/kmall/admin/controller/UserController.java

@@ -2,9 +2,11 @@ package com.kmall.admin.controller;
 
 import com.kmall.admin.entity.UserEntity;
 import com.kmall.admin.service.UserService;
+import com.kmall.common.entity.SysUserEntity;
 import com.kmall.common.utils.PageUtils;
 import com.kmall.common.utils.Query;
 import com.kmall.common.utils.R;
+import com.kmall.common.utils.ShiroUtils;
 import com.kmall.common.utils.excel.ExcelExport;
 import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -35,6 +37,15 @@ public class UserController {
     @RequestMapping("/list")
     @RequiresPermissions("user:list")
     public R list(@RequestParam Map<String, Object> params) {
+
+        SysUserEntity user = ShiroUtils.getUserEntity();
+
+        //判断当前用户是店员还是商户
+        if ("2".equals(user.getRoleType())) {
+            params.put("storeId", user.getStoreId());
+        }else if ("3".equals(user.getRoleType())) {
+            params.put("merchSn", user.getMerchSn());
+        }
         //查询列表数据
         Query query = new Query(params);
 

kmall-admin/src/main/resources/mybatis/mapper/StoreDao.xml

@@ -82,6 +82,9 @@
 		moder_sn, mod_time, tstm
 		from mall_store
 		WHERE 1=1
+		<if test="merchSn != null and merchSn.trim() != ''">
+			AND merch_sn = #{merchSn}
+		</if>
 		<if test="storeName != null and storeName.trim() != ''">
 			AND store_name LIKE concat('%',#{storeName},'%')
 		</if>

kmall-admin/src/main/resources/mybatis/mapper/UserDao.xml

@@ -28,12 +28,22 @@
 	</select>
 
     <select id="queryList" resultType="com.kmall.admin.entity.UserEntity">
-        select
+        select distinct
         mall_user.*,
         mall_user_level.name levelName
         from mall_user
+        LEFT JOIN mall_merch_user ON mall_user.id=mall_merch_user.user_id
         LEFT JOIN mall_user_level ON mall_user.user_level_id=mall_user_level.id
         WHERE 1=1
+        <if test="storeId != null">
+            and store_id = #{storeId}
+        </if>
+        <if test="merchSn != null and merchSn.trim() != ''">
+            and merch_sn = #{merchSn}
+        </if>
+        <if test="username != null and username.trim() != ''">
+            and username like concat('%',#{username},'%')
+        </if>
         <if test="username != null and username.trim() != ''">
             and username like concat('%',#{username},'%')
         </if>

kmall-admin/src/main/webapp/WEB-INF/page/sys/user.html

@@ -58,16 +58,16 @@
                     <Radio label="3">商户管理员</Radio>
                 </Radio-group>
             </Form-item>
+            <Form-item label="商户" prop="merchSn">
+                <i-select v-model="user.merchSn" filterable placeholder="商户" @on-change="getStoresByMerch" label-in-value>
+                    <i-option v-for="merch in merchList" :value="merch.merchSn" :key="merch.merchSn">{{merch.merchName}}</i-option>
+                </i-select>
+            </Form-item>
             <Form-item label="门店" prop="storeId">
                 <i-select v-model="user.storeId" filterable placeholder="门店" label-in-value>
                     <i-option v-for="store in storeList" :value="store.id" :key="store.id">{{store.storeName}}</i-option>
                 </i-select>
             </Form-item>
-            <Form-item label="商户" prop="merchSn">
-                <i-select v-model="user.merchSn" filterable placeholder="商户" label-in-value>
-                    <i-option v-for="merch in merchList" :value="merch.merchSn" :key="merch.merchSn">{{merch.merchName}}</i-option>
-                </i-select>
-            </Form-item>
             <Form-item label="状态" prop="status">
                 <Radio-group v-model="user.status">
                     <Radio label="0">

kmall-admin/src/main/webapp/js/sys/user.js

@@ -105,7 +105,7 @@ var vm = new Vue({
             //获取角色信息
             this.getRoleList();
             // vm.getDept();
-            vm.getStoreList();
+            //vm.getStoreList();
             vm.getMerchList();
         },
         getStoreList: function() {
@@ -113,6 +113,12 @@ var vm = new Vue({
                 vm.storeList = r.list;
             });
         },
+        getStoresByMerch: function (opt) {
+            var value = opt.value;
+            $.get("../store/getStoresByMerch?merchSn=" + value, function (r) {
+                vm.storeList = r.list;
+            });
+        },
         getMerchList: function() {
             $.get("../merch/queryAll", function (r) {
                 vm.merchList = r.list;
@@ -141,7 +147,8 @@ var vm = new Vue({
             $.get("../sys/user/info/" + userId, function (r) {
                 vm.user = r.user;
                 //获取角色信息
-                vm.getStoreList();
+                // vm.getStoreList();
+                vm.getStoresByMerch();
                 vm.getRoleList();
                 vm.getMerchList();
                 // vm.getDept();

kmall-common/src/main/java/com/kmall/common/service/impl/SysUserServiceImpl.java

@@ -84,6 +84,7 @@ public class SysUserServiceImpl implements SysUserService {
             throw new RRException(r.get("msg").toString());
         } else {
             if ("2".equals(user.getRoleType())) {
+                builder.put("merchSn", "商户");
                 builder.put("storeId", "门店");
             }else if ("3".equals(user.getRoleType())) {
                 builder.put("merchSn", "商户");
@@ -130,6 +131,7 @@ public class SysUserServiceImpl implements SysUserService {
             throw new RRException(r.get("msg").toString());
         } else {
             if ("2".equals(user.getRoleType())) {
+                builder.put("merchSn", "商户");
                 builder.put("storeId", "门店");
             }else if ("3".equals(user.getRoleType())) {
                 builder.put("merchSn", "商户");