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

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

@@ -122,8 +122,8 @@ var vm = new Vue({
             vm.title = "新增";
             vm.role = {deptId: '', deptName: ''};
             vm.getMenuTree(null);
-            vm.getDept();
-            vm.getDataTree();
+            // vm.getDept();
+            // vm.getDataTree();
         },
         update: function () {
             var roleId = getSelectedRow();
@@ -133,7 +133,7 @@ var vm = new Vue({
 
             vm.showList = false;
             vm.title = "修改";
-            vm.getDataTree();
+            // vm.getDataTree();
             vm.getMenuTree(roleId);
         },
         del: function (event) {
@@ -179,7 +179,7 @@ var vm = new Vue({
                     data_ztree.checkNode(node, true, false);
                 }
 
-                vm.getDept();
+                // vm.getDept();
             });
         },
         saveOrUpdate: function (event) {

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

@@ -102,7 +102,7 @@ var vm = new Vue({
             vm.storeList = [];
             //获取角色信息
             this.getRoleList();
-            vm.getDept();
+            // vm.getDept();
             vm.getStoreList();
         },
         getStoreList: function() {
@@ -135,7 +135,7 @@ var vm = new Vue({
                 //获取角色信息
                 vm.getStoreList();
                 vm.getRoleList();
-                vm.getDept();
+                // vm.getDept();
             });
 
         },

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

@@ -114,7 +114,7 @@ public class SysRoleController extends AbstractController {
     @RequestMapping("/update")
     @RequiresPermissions("sys:role:update")
     public R update(@RequestBody SysRoleEntity role) {
-        ValidatorUtils.validateEntity(role);
+//        ValidatorUtils.validateEntity(role);
 
         role.setCreateUserId(getUserId());
         sysRoleService.update(role);