Merge remote-tracking branch 'origin/group2-organization'

src/main/webapp/assets/modular/system/onlineUser/online_user.js

@@ -51,7 +51,6 @@ layui.use(['table', 'HttpRequest'], function () {
         }, function (data) {
             Feng.error(data.message + "!");
         });
-        console.log(data)
         httpRequest.set('token', data.token);
         httpRequest.start(true);
     };

src/main/webapp/assets/modular/system/organization/organization.js

@@ -33,7 +33,6 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'HttpRequest',
 
     // 选择部门时
     Organization.onClickDept = function (obj) {
-        console.log(obj);
         Organization.condition.orgParentId = obj.data.id;
         Organization.search();
     };

src/main/webapp/assets/modular/system/organization/organization_edit.js

@@ -14,10 +14,11 @@ layui.use(['form', 'admin', 'HttpRequest', 'xmSelect'], function () {
 
     // 初始化组织树
     new HttpRequest(Feng.ctxPath + "/hrOrganization/treeLayui", 'get', function (data) {
+        console.log(result.data);
         organizationXmSel = xmSelect.render({
             el: '#organization',
             data: data.data,
-            initValue: [result.data.orgId],
+            initValue: [result.data.orgParentId],
             layVerify: 'required',
             model: {label: {type: 'text'}},
             prop: {name: 'title', value: 'id'},

src/main/webapp/assets/modular/system/user/user.js

@@ -45,7 +45,6 @@ layui.use(['layer', 'form', 'table', 'ztree', 'laydate', 'admin', 'HttpRequest',
      * 选择部门时
      */
     MgrUser.onClickDept = function (obj) {
-        console.log(obj);
         MgrUser.condition.orgId = obj.data.id;
         MgrUser.search();
     };

src/main/webapp/assets/modular/system/user/user_role.js

@@ -11,7 +11,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], func
     var result = request.start();
     form.val('userForm', result.data);
 
-    console.log(result.data.grantRoleIdList);
     // 初始化角色
     new HttpRequest(Feng.ctxPath + "/sysRole/dropDown", 'get', function (data) {
         roleXmSel = xmSelect.render({
@@ -27,7 +26,6 @@ layui.use(['layer', 'form', 'admin', 'laydate', 'HttpRequest', 'xmSelect'], func
     // 表单提交事件
     form.on('submit(btnSubmit)', function (data) {
         // 角色ids
-        console.log(Feng.getUrlParam("userId"));
         data.field.grantRoleIdList = roleXmSel.getValue('value');
         data.field.userId = Feng.getUrlParam("userId");