From 6be36befbff5ce10ec1d560344856d745e54106a Mon Sep 17 00:00:00 2001
From: 侯瑞军 <411269194@kidgrow.com>
Date: Mon, 27 Apr 2020 10:24:02 +0800
Subject: [PATCH] 完善用户组织关系细节。

---
 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java |    2 +-
 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html                                               |   20 +++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
index 10e1c94..57b269b 100644
--- a/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
+++ b/kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java
@@ -57,7 +57,6 @@
         if (bindingResult.hasErrors()) {
             return ResultBody.failed().msg(bindingResult.getFieldError().getDefaultMessage());
         } else {
-            //先查出来父节点的信息
             if (sysUserOrg.getUserId() != null) {
                 String createUserOrgCode = "";
                 List<SysOrganization> userOrgData = sysUser.getOrganizations();
@@ -67,6 +66,7 @@
                     }
                 }
                 if (!createUserOrgCode.isEmpty()) {
+                    //查出用户的所有组织关系数据
                     Map<String, Object> map = new HashMap<String, Object>();
                     map.put("user_id", sysUserOrg.getUserId());
                     List<SysUserOrg> userOrgList = sysUserOrgService.getListByMap(map);
diff --git a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
index 3369780..6ea4686 100644
--- a/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
+++ b/kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html
@@ -30,8 +30,8 @@
     <div class="layui-form-item">
         <label class="layui-form-label">状态</label>
         <div class="layui-input-block">
-            <input type="radio" name="enabled" value="0" title="启用" />
-            <input type="radio" name="enabled" value="1" title="禁用" />
+            <input type="radio" name="enabled" value="1" title="启用" />
+            <input type="radio" name="enabled" value="0" title="禁用" />
         </div>
     </div>
     <div class="layui-form-item model-form-footer">
@@ -54,7 +54,6 @@
         var formSelects = layui.formSelects;
         var tree = layui.tree;
 
-        //$("input[name=enabled][value==0]").prop("checked", "true");
         // 回显user数据
         var user = admin.getTempData('t_user');
         $('#user-org-form').attr('method', 'POST');
@@ -64,19 +63,18 @@
             $("#userId").val(user.id);
             admin.req('api-user/sysuserorg', { user_id: user.id }, function (data) {
                 if (data.code == 0) {
-                    debugger
                     if (data.data.length > 1) {
                         let useData = data.data[1];
                         $("#orgId").val(useData.orgId);
                         $("#userId").val(useData.userId);
                         $("#id").val(useData.id);
                         if (useData.enabled) {
-                            //$("input[name=enabled][value=0]").prop("checked", "true");
-                            //$("input[name=enabled][value=1]").prop("checked", "false");
+                            $('input[name="enabled"][value="0"]').removeAttr("checked");
+                            $('input[name="enabled"][value="1"]').attr("checked", "true");
                         }
                         else {
-                            //$("input[name=enabled][value=0]").prop("checked", "false");
-                            //$("input[name=enabled][value=1]").prop("checked", "true");
+                            $('input[name="enabled"][value="1"]').removeAttr("checked");
+                            $('input[name="enabled"][value="0"]').attr("checked", "true");
                         }
                         admin.req('api-user/sysorganization/' + useData.orgId, {}, function (dataName) {
                             if (dataName.code == 0) {
@@ -96,6 +94,8 @@
                     else {
                         $("#userId").val(user.id);
                         $("#id").val("");
+                        $('input[name="enabled"][value="1"]').attr("checked", "true");
+                        $('input[name="enabled"][value="0"]').removeAttr("checked");
                     }
                 }
                 else {
@@ -103,6 +103,8 @@
                         admin.finishPopupCenter();
                     });
                 }
+                
+                form.render();
             }, 'get');
         }
         else {
@@ -136,7 +138,7 @@
             layer.load(2);
             if (!strUtil.isEmpty($("#orgId").val())) {
                 if (data.field != null) {
-                    data.field.enabled = (data.field.enabled == 0) ? fase : true;
+                    data.field.enabled = (data.field.enabled == 0) ? false : true;
                     admin.req('api-user/sysuserorg', JSON.stringify(data.field), function (data) {
                         layer.closeAll('loading');
                         debugger

--
Gitblit v1.8.0