网关修改 判断逻辑 ， 数据权限修改

zhaoxiaohao

2020-07-23 2a0e777c3d5d8198554bcdf50f36d54927176fae

网关修改  判断逻辑 ，  数据权限修改

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-api/src/main/java/com/kidgrow/oprationcenter/feign/ConsumptionService.java

@@ -50,5 +50,5 @@
     * @param departmentId
     */
    @GetMapping(value = "productorderdetail/UserProductDetailData")
    ResultBody UserProductDetailData (@RequestParam Long hospitalId, Long departmentId);
    ResultBody UserProductDetailData (@RequestParam("hospitalId") Long hospitalId, @RequestParam("departmentId")Long departmentId);
}

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/java/com/kidgrow/oprationcenter/service/impl/DataNeedServiceImpl.java

@@ -1,6 +1,7 @@
package com.kidgrow.oprationcenter.service.impl;

import com.alibaba.fastjson.JSON;
import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.kidgrow.common.model.PageResult;
import com.kidgrow.common.model.ResultBody;
@@ -57,7 +58,21 @@

    @Override
    public List<DataNeedExcel> findListExportByParam(Map<String, Object> params) {
        List<DataNeed> dataNeeds = baseMapper.selectByMap(params);
        QueryWrapper queryWrapper=new QueryWrapper();
        String doctor_name = MapUtils.getString(params, "doctor_name");
        if(doctor_name!=null){
            queryWrapper.like("doctor_name","%"+doctor_name+"%");
        }
        String need_begintime = MapUtils.getString(params, "need_begintime");
        if(need_begintime!=null){
            queryWrapper.gt("need_begintime",need_begintime);
        }
        String need_endtime = MapUtils.getString(params, "need_endtime");
        if(need_endtime!=null){
            queryWrapper.gt("need_endtime",need_endtime);
        }
        queryWrapper.eq("is_del",0);
        List<DataNeed> dataNeeds = baseMapper.selectList(queryWrapper);
        List<DataNeedExcel> voList=new ArrayList<>();
        dataNeeds.forEach(e ->{
            DataNeedExcel vo=new DataNeedExcel();

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-server/src/main/java/com/kidgrow/oprationcenter/controller/ProductOrderDetailController.java

@@ -132,7 +132,7 @@

    @ApiOperation(value = "获取医院套餐是否到期和到期时间")
    @GetMapping("/UserProductDetailData")
    public ResultBody UserProductDetailData(@RequestParam Long hospitalId,Long departmentId) {
    public ResultBody UserProductDetailData(@RequestParam("hospitalId") Long hospitalId,@RequestParam("departmentId")Long departmentId) {
        return productOrderDetailService.UserProductDetailData(hospitalId,departmentId);
    }


 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-server/src/main/java/com/kidgrow/usercenter/controller/SysUserOrgController.java

@@ -1,12 +1,17 @@
package com.kidgrow.usercenter.controller;

import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
import com.kidgrow.common.annotation.LoginUser;
import com.kidgrow.common.model.ResultBody;
import com.kidgrow.common.model.SysOrganization;
import com.kidgrow.common.model.SysUser;
import com.kidgrow.common.model.SysUserOrg;
import com.kidgrow.usercenter.model.SysDepartment;
import com.kidgrow.usercenter.model.SysHospital;
import com.kidgrow.usercenter.service.ISysOrganizationService;
import com.kidgrow.usercenter.service.ISysUserOrgService;
import com.kidgrow.usercenter.service.impl.SysDepartmentServiceImpl;
import com.kidgrow.usercenter.service.impl.SysHospitalServiceImpl;
import io.swagger.annotations.Api;
import io.swagger.annotations.ApiOperation;
import lombok.extern.slf4j.Slf4j;
@@ -29,6 +34,10 @@
    private ISysUserOrgService sysUserOrgService;
    @Autowired
    private ISysOrganizationService sysOrganizationService;
    @Autowired
    private SysDepartmentServiceImpl sysDepartmentService;
    @Autowired
    private SysHospitalServiceImpl sysHospitalService;

    @PostMapping("getListByMap")
    public List<SysUserOrg> getListByMap(@RequestParam Map<String, Object> map) {
@@ -74,9 +83,31 @@
                        for (int i = 0; i < userOrgList.size(); i++) {
                            if (sysUserOrg.getId().equals(userOrgList.get(i).getId())) {
                                userOrgList.get(i).setOrgId(sysUserOrg.getOrgId());
                                userOrgList.get(i).setFromLevel(2);

                                //查询  科室
                                QueryWrapper queryWrapper=new QueryWrapper();
                                queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                                queryWrapper.eq("is_del",0);
                                queryWrapper.eq("enabled",1);
                                List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
                                if(!list.isEmpty()){
                                    userOrgList.get(i).setFromId(list.get(0).getId());
                                }else {
                                    userOrgList.get(i).setFromId(null);
                                }
                            }
                            else
                            {
                                QueryWrapper queryWrapper=new QueryWrapper();
                                queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                                queryWrapper.eq("is_del",0);
                                queryWrapper.eq("enabled",1);
                                List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
                                if (!listHospital.isEmpty()) {
                                    userOrgList.get(i).setFromId(listHospital.get(0).getId());
                                }
                                userOrgList.get(i).setFromLevel(1);
                                userOrgList.get(i).setOrgId(sysUserOrg.getUpdateUserId());
                            }
                            userOrgList.get(i).setEnabled(sysUserOrg.getEnabled());
@@ -93,15 +124,37 @@
                            sysUserOrgTemp.setUserId(sysUserOrg.getUserId());
                            sysUserOrgTemp.setEnabled(sysUserOrg.getEnabled());
                            sysUserOrgTemp.setCreateUserOrgCode(createUserOrgCode);
                            userOrgList.add(sysUserOrgTemp);
                            sysUserOrgTemp.setFromLevel(2);

                            sysUserOrg.setUpdateUserId(0L);
                            //查询  科室
                            QueryWrapper queryWrapper=new QueryWrapper();
                            queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                            queryWrapper.eq("is_del",0);
                            queryWrapper.eq("enabled",1);
                            List<SysDepartment> list = sysDepartmentService.list(queryWrapper);
                            if(!list.isEmpty()){
                                sysUserOrgTemp.setFromId(list.get(0).getId());
                            }
                            userOrgList.add(sysUserOrgTemp);
                            //查询 医院
                            queryWrapper=new QueryWrapper();
                            queryWrapper.eq("org_id",sysUserOrg.getUpdateUserId());
                            queryWrapper.eq("is_del",0);
                            queryWrapper.eq("enabled",1);
                            List<SysHospital> listHospital = sysHospitalService.list(queryWrapper);
                            if (!listHospital.isEmpty()) {
                                sysUserOrgTemp.setFromId(listHospital.get(0).getId());
                            }
                            sysUserOrgTemp.setFromLevel(1);
//                            sysUserOrg.setUpdateUserId(0L);
                            sysUserOrg.setOrgId(sysOrganization.getOrgParentId());
                            sysUserOrg.setCreateUserOrgCode(createUserOrgCode);
                            userOrgList.add(sysUserOrg);
                        } else {
                            return ResultBody.failed().data(null).msg("该组织的上级组织数据异常！");
                        }
                    }
                    //查询
                    boolean v = sysUserOrgService.saveOrUpdateBatch(userOrgList);
                    if (v) {
                        return ResultBody.ok().data(sysUserOrg).msg("保存成功");

 kidgrow-commons/kidgrow-common-spring-boot-starter/src/main/java/com/kidgrow/common/model/SysUserOrg.java

@@ -1,5 +1,7 @@
package com.kidgrow.common.model;

import com.baomidou.mybatisplus.annotation.FieldStrategy;
import com.baomidou.mybatisplus.annotation.TableField;
import com.baomidou.mybatisplus.annotation.TableName;
import com.fasterxml.jackson.databind.annotation.JsonSerialize;
import com.fasterxml.jackson.databind.ser.std.ToStringSerializer;
@@ -44,6 +46,7 @@
     */
    @JsonSerialize(using = ToStringSerializer.class)
    @NotNull(message = "医院/科室表里面的id")
    @TableField(updateStrategy = FieldStrategy.IGNORED)
    private Long fromId;
    /**
     * 组织级别 0集团 1医院公司 2科室部门

 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/java/com/kidgrow/zuul/filter/UserInfoHeaderFilter.java

@@ -90,12 +90,15 @@
                    doctorId=sysDoctors.get(0).getId();
                    departmentId=sysDoctors.get(0).getDepartmentId();
                    departmentName=sysDoctors.get(0).getDepartmentName();
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_NAME_HEADER, URLEncoder.encode(sysDoctors.get(0).getHospitalName(),"UTF-8"));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(departmentId));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_NAME_HEADER,URLEncoder.encode(departmentName,"UTF-8"));
                }
                ctx.addZuulRequestHeader(SecurityConstants.USER_ID_HEADER, String.valueOf(user.getId()));
                ctx.addZuulRequestHeader(SecurityConstants.DOCTOR_ID_HEADER, String.valueOf(doctorId));
                ctx.addZuulRequestHeader(SecurityConstants.USER_HEADER, user.getUsername());

                ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME,URLEncoder.encode(str,"UTF-8"));//待完善
                ctx.addZuulRequestHeader(SecurityConstants.USER_REAL_NAME,URLEncoder.encode(str,"UTF-8"));
                ctx.addZuulRequestHeader(SecurityConstants.USER_HOSPITAL_ID_HEADER,hospital.toString());
                tenantId=hospital.toString();
                List<SysOrganization> organizations = (List<SysOrganization>) user.getOrganizations();
@@ -103,9 +106,6 @@
                organizations.sort((e1,e2)->e1.getOrgLevel().compareTo(e2.getOrgLevel()));
                if (organizations != null&&organizations.size()>0) {
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_ID_HEADER,String.valueOf(organizations.get(0).getId()));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORG_NAME_HEADER, URLEncoder.encode(organizations.get(0).getOrgName(),"UTF-8"));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_ID_HEADER,String.valueOf(departmentId));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_DEP_NAME_HEADER,(departmentName.equals("")?URLEncoder.encode(organizations.get(organizations.size()-1).getOrgName(),"UTF-8"):departmentName));
                    ctx.addZuulRequestHeader(SecurityConstants.USER_ORGS_HEADER,JSON.toJSONString(organizations));
                }
                //将角色放到header

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/dataNeed.html

@@ -245,11 +245,27 @@
        }
        // 导出
        $('#app-btn-export').click(function () {
            var key = $('#app-edit-search').val();
            var needBegintime = $('#test1').val();
            var needEndtime = $('#test2').val();
            if (needBegintime != null && needEndtime != null) {
                var flag = compareDate(needBegintime, needEndtime);
                if (!flag) {
                    layer.msg('结束时间不得小于开始时间');
                    return;
                }
            }
            //获取
            var url = config.base_server + 'api-opration/dataneed/export';
            var xhr = new XMLHttpRequest();
            xhr.open('POST', url, true);
            xhr.responseType = "blob";
             var form = new FormData();
            // Add selected file to form
            form.append("doctor_name", key);
            form.append('need_begintime',needBegintime);
            form.append('need_endtime',needEndtime);

            xhr.setRequestHeader("client_type", "DESKTOP_WEB");
            xhr.setRequestHeader("Authorization", "Bearer " + config.getToken().access_token);
            xhr.onload = function () {
@@ -268,7 +284,7 @@
                    document.body.removeChild(a);
                }
            }
            xhr.send();
            xhr.send(form);
        });

        // 显示编辑弹窗

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor.html

@@ -390,7 +390,7 @@
            admin.popupCenter({
                title: '编辑医生',
                path: 'pages/opration/doctor_form.html',
                area: '800px',
                area: '900px',
                finish: function () {
                }
            });

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/opration/doctor_form.html

@@ -2,82 +2,101 @@
    <input name="id" type="hidden" />
    <div style="display:flex">
        <div class="layui-form-item">
            <label class="layui-form-label">所在医院</label>
            <div class="layui-input-block">
                <input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
                    maxlength="50" lay-verify="required" required style="width: 175px;"/>
    <input type="hidden" name="hospitalId" id="hospitalId"/>
            <div class="layui-inline">
                <label class="layui-form-label" style="width: 75px;">所在医院</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="hospitalName" id="hospitalName" placeholder="请输入医院名称" type="text" class="layui-input"
                        maxlength="50" lay-verify="required" required style="width: 150px;" />
                    <input type="hidden" name="hospitalId" id="hospitalId" />
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">科室</label>
            <div class="layui-input-block">
                <input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden" class="layui-input"
                    maxlength="20" />
                <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="请选择科室"
                    lay-verify="required" required>
                    <option value="">-请选择科室-</option>
                </select>
            <div class="layui-inline">
                <label class="layui-form-label">科室</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="departmentName" id="departmentName" placeholder="请选择科室" type="hidden"
                        class="layui-input" maxlength="20" />
                    <select id="departmentId" name="departmentId" lay-filter="departmentId" placeholder="请选择科室"
                        lay-verify="required" required>
                        <option value="">-请选择科室-</option>
                    </select>
                </div>
            </div>
        </div>
        
        <div class="layui-form-item">
            <label class="layui-form-label">医生类型</label>
            <div class="layui-input-block">
                <select id="doctorType" name="doctorType" lay-filter="doctorType" 
                    lay-verify="required" required>
                    <option value="2" selected>C端医生</option>
                    <option value="1">H端医生</option>
                    <option value="0">C端+H端</option>
                </select>
            <div class="layui-inline">
                <label class="layui-form-label">医生类型</label>
                <div class="layui-input-block" style="width: 150px;">
                    <select id="doctorType" name="doctorType" lay-filter="doctorType" lay-verify="required" required>
                        <option value="2" selected>C端医生</option>
                        <option value="1">H端医生</option>
                        <option value="0">C端+H端</option>
                    </select>
                </div>
            </div>

            <!-- </div>
        <div class="layui-form-item"> -->

            <!-- </div>

        <div class="layui-form-item"> -->

        </div>
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <label class="layui-form-label">姓名</label>
            <div class="layui-input-block">
                <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
                    required  style="width: 175px;"/>
            <div class="layui-inline">
                <label class="layui-form-label">姓名</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="doctorName" type="text" class="layui-input" maxlength="20" lay-verify="required"
                        required style="width: 150px;" />
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">职称</label>
            <div class="layui-input-block">
                <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
                    lay-verify="required" required>
                    <option value="">-请选择-</option>
                </select>
                <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
            <div class="layui-inline">
                <label class="layui-form-label">职称</label>
                <div class="layui-input-block" style="width: 150px;">
                    <select id="doctorRankId" name="doctorRankId" lay-filter="doctorRankId" placeholder="选择一个职称"
                        lay-verify="required" required>
                        <option value="">-请选择-</option>
                    </select>
                    <input name="doctorRank" id='doctorRank' type="hidden" class="layui-input" maxlength="20" />
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">角色</label>
            <div class="layui-input-block">
                <select name="roleId" xm-select="roleId" lay-verify="required">
                </select>
            <div class="layui-inline">
                <label class="layui-form-label">角色</label>
                <div class="layui-input-block" style="width: 150px;">
                    <select name="roleId" xm-select="roleId" lay-verify="required">
                    </select>
                </div>
            </div>

            <!-- </div>
        <div class="layui-form-item"> -->

            <!-- </div>
        <div class="layui-form-item"> -->

        </div>
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <label class="layui-form-label">联系电话</label>
            <div class="layui-input-block">
                <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
                    lay-verify="required|phone" required  style="width: 175px;"/>
            <div class="layui-inline">
                <label class="layui-form-label">联系电话</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20"
                        lay-verify="required|phone" required style="width: 150px;" />
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">联系电话2</label>
            <div class="layui-input-block">
                <input name="doctorOtherLink" type="text" class="layui-input" maxlength="20" />
            <div class="layui-inline">
                <label class="layui-form-label">其它联系方式</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="doctorOtherLink" type="text" class="layui-input" maxlength="20" />
                </div>
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">Email</label>
            <div class="layui-input-block">
                <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email"
                    required />
            <div class="layui-inline">
                <label class="layui-form-label">Email</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="doctorEmail" type="text" class="layui-input" maxlength="20" lay-verify="required|email"
                        required />
                </div>
            </div>
        </div>
    </div>
@@ -85,7 +104,8 @@
        <div class="layui-form-item">
            <label class="layui-form-label">医生简介</label>
            <div class="layui-input-block">
                <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300" style="width: 650px;"></textarea>
                <textarea name="doctorAbout" id="doctorAbout" class="layui-textarea" maxlength="300"
                    style="width: 650px;"></textarea>
            </div>
        </div>
    </div>
@@ -93,21 +113,24 @@
        <div class="layui-form-item">
            <label class="layui-form-label">医生状态</label>
            <div class="layui-input-block">
                <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常" class="layui-input"/>
                <input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用" class="layui-input" />
                <input name="doctorState" id="doctorState-shi" type="radio" checked value="true" title="正常"
                    class="layui-input" />
                <input name="doctorState" id="doctorState-fou" type="radio" value="false" title="试用"
                    class="layui-input" />
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label"> 置顶</label>
            <div class="layui-input-block">
                <input name="isTop" id="isTop-shi" type="radio" checked value="true" title="是" class="layui-input"/>
                <input name="isTop" id="isTop-shi" type="radio" checked value="true" title="是" class="layui-input" />
                <input name="isTop" id="isTop-fou" type="radio" value="false" title="否" class="layui-input" />
            </div>
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">医答</label>
            <div class="layui-input-block">
                <input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是" class="layui-input"/>
                <input name="isAnswer" id="isAnswer-shi" type="radio" checked value="true" title="是"
                    class="layui-input" />
                <input name="isAnswer" id="isAnswer-fou" type="radio" value="false" title="否" class="layui-input" />
            </div>
        </div>
@@ -115,58 +138,74 @@
            <label class="layui-form-label">签约</label>
            <div class="layui-input-block">
                <input name="isSigning" id="isSigning-shi" type="radio" checked value="true" title="是"
                    class="layui-input"/>
                <input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input"/>
                    class="layui-input" />
                <input name="isSigning" id="isSigning-fou" type="radio" value="false" title="否" class="layui-input" />
            </div>
        </div>
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <label class="layui-form-label">登录帐号</label>
            <div class="layui-input-block">
                <input name="username" id="username" readonly type="text" class="layui-input" maxlength="20"
                    lay-verify="required" required />
            <div class="layui-inline">
                <label class="layui-form-label">登录帐号</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="username" id="username" readonly type="text" class="layui-input" maxlength="20"
                        lay-verify="required" required />
                </div>
            </div>
        </div>
            <div class="layui-inline">
                <label class="layui-form-label">登录密码</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="password" type="password" lay-verify="required" class="layui-input" maxlength="20"
                        lay-verify="required|phone" required />
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">确认密码</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="passwordSure" type="password" lay-verify="required|confirmPass" class="layui-input"
                        maxlength="20" />
                </div>
            </div>

            <!-- </div>
        <div class="layui-form-item">
            <label class="layui-form-label">登录密码</label>
            <div class="layui-input-block">
                <input name="password" type="password" lay-verify="required" class="layui-input" maxlength="20"
                    lay-verify="required|phone" required />
            </div>
            
        </div>
        <div class="layui-form-item">
            <label class="layui-form-label">确认密码</label>
            <div class="layui-input-block">
                <input name="passwordSure" type="password" lay-verify="required|confirmPass" class="layui-input"
                    maxlength="20" />
            </div>
        <div class="layui-form-item"> -->

        </div>
    </div>
    <div style="display:flex">
        <div class="layui-form-item">
            <label class="layui-form-label">医生的头像</label>
            <div class="layui-input-block" id="demo">
                <button type="button" class="layui-btn" id="phonto">
                    <i class="layui-icon">&#xe67c;</i>上传图片
                </button>
                <input name="doctorLogo" id="doctorLogo-add" type="hidden" class="layui-input" maxlength="20" />
                <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                    预览效果
                    <div class="layui-upload-list" id="demo2"></div>
                </blockquote>
            <div class="layui-inline">
                <label class="layui-form-label">医生的头像</label>
                <div class="layui-input-block" id="demo" style="width: 150px;">
                    <button type="button" class="layui-btn" id="phonto">
                        <i class="layui-icon">&#xe67c;</i>上传图片
                    </button>
                    <input name="doctorLogo" id="doctorLogo-add" type="hidden" class="layui-input" maxlength="20" />
                    <blockquote class="layui-elem-quote layui-quote-nm" style="margin-top: 10px;">
                        预览效果
                        <div class="layui-upload-list" id="demo2"></div>
                    </blockquote>
                </div>
            </div>
            <div class="layui-inline">
                <label class="layui-form-label">销售代表</label>
                <div class="layui-input-block" style="width: 150px;">
                    <input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input"
                        maxlength="15" />
                    <select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add"
                        lay-verify="required" required>
                        <option value="">-请选择-</option>
                    </select>
                </div>
            </div>
            <!--             
        </div>
        
        <div class="layui-form-item">
            <label class="layui-form-label">销售代表</label>
            <div class="layui-input-block">
                <input name="serverUserName" id="serverUserName-add" type="hidden" class="layui-input" maxlength="15" />
                <select id="serverUserId-add" name="serverUserId" lay-filter="serverUserId-add" 
                    lay-verify="required" required>
                    <option value="">-请选择-</option>
                </select>
            </div>

        <div class="layui-form-item"> -->

        </div>
    </div>

@@ -188,7 +227,7 @@
        var autocomplete = layui.autocomplete;
        var formSelects = layui.formSelects;
        var $ = layui.jquery;
        

        //获取角色
        var get_role = function () {
            admin.req('api-user/findByMap?tenant_id=hospital', {}, function (data) {
@@ -322,6 +361,7 @@
            if (data.field.roleId != null && data.field.roleId != "") {
                data.field.roles = data.field.roleId.split(',');
            }
            data.field.hospitalId = ""+data.field.hospitalId;
            data.field.roleId = null;
            debugger
            admin.req('api-user/sysdoctor', JSON.stringify(data.field), function (data) {
@@ -337,7 +377,7 @@
            }, "POST");
            return false;
        });
        

        //将新增  中的 serverUserName 赋值
        form.on('select(serverUserId-add)', function (data) {
            //将医院名称赋值

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/pages/system/user_org_form.html

@@ -139,6 +139,7 @@
            if (!strUtil.isEmpty($("#orgId").val())) {
                if (data.field != null) {
                    data.field.enabled = (data.field.enabled == 0) ? false : true;
                    data.field.fromId=0;
                    admin.req('api-user/sysuserorg', JSON.stringify(data.field), function (data) {
                        layer.closeAll('loading');
                        if (data.code == 0) {