增加feign客户端调用排除 tenant的注解。 修改完善诊断记录查看的细节问题

侯瑞军

2020-04-28 83715ed7019ab37a4611a2e4e506f84aa1f7b1b0

 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);
@@ -75,6 +75,10 @@
                            if (sysUserOrg.getId().equals(userOrgList.get(i).getId())) {
                                userOrgList.get(i).setOrgId(sysUserOrg.getOrgId());
                            }
                            else
                            {
                                userOrgList.get(i).setOrgId(sysUserOrg.getUpdateUserId());
                            }
                            userOrgList.get(i).setEnabled(sysUserOrg.getEnabled());
                            userOrgList.get(i).setCreateUserOrgCode(createUserOrgCode);
                        }