修改管理员列表根据登录用户权限显示SQL；修改管理员列表新增表单，数据角色类型项,非admin用户隐藏添加操作员单选项

kmall-admin/src/main/java/com/kmall/admin/fromcomm/controller/SysRoleController.java

@@ -75,6 +75,16 @@ public class SysRoleController extends AbstractController {
     }
 
     /**
+     * 用户id
+     */
+    @RequestMapping("/selectUserId")
+    @RequiresPermissions("sys:role:select")
+    public R selectUserId() {
+
+        return R.ok().put("userId", getUserId());
+    }
+
+    /**
      * 角色信息
      */
     @RequestMapping("/info/{roleId}")

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

@@ -25,7 +25,7 @@
 		left join sys_role r on r.role_id = ur.role_id
 		<where>
 			<if test="createUserId != null">
-				and `create_user_id` = #{createUserId} 
+				and u.`create_user_id` = #{createUserId}
 			</if>
 			<if test="username != null and username.trim() != ''">
 				and u.`username` like concat('%',#{username},'%')

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

@@ -65,7 +65,7 @@
             </Form-item>
             <Form-item label="数据角色类型" prop="roleType">
                 <Radio-group v-model="user.roleType" @on-change="changeRole">
-                    <Radio label="1">操作员</Radio>
+                    <Radio label="1" v-show="isAdmin">操作员</Radio>
                     <Radio label="2">店员</Radio>
                     <Radio label="3">商户管理员</Radio>
                     <Radio label="4">第三方商户管理员</Radio>

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

@@ -138,7 +138,8 @@ var vm = new Vue({
         thirdMerchantBizList: [],
         isMerchShow:false,
         isStoreShow:false,
-        isThirdMerchShow:false
+        isThirdMerchShow:false,
+        isAdmin: false
     },
     methods: {
         query: function () {
@@ -152,8 +153,11 @@ var vm = new Vue({
             vm.storeList = [];
             vm.merchList = [];
             vm.thirdMerchantBizList = [];
+            vm.isAdmin = false;
             //获取角色信息
             this.getRoleList();
+            //获取用户ID
+            this.getUserId();
             // vm.getDept();
             //vm.getStoreList();
             vm.changeRole(2);
@@ -298,6 +302,14 @@ var vm = new Vue({
                 vm.roleList = r.list;
             });
         },
+        getUserId:function(){
+            $.get("../sys/role/selectUserId", function (r) {
+                var userId = r.userId;
+                if(userId == 1){
+                    vm.isAdmin = true;
+                }
+            });
+        },
         reload: function (event) {
             vm.showList = true;
             var page = $("#jqGrid").jqGrid('getGridParam', 'page');