Merge remote-tracking branch 'origin/dev' into dev

luliqiang

2020-06-15 1781a1990f0dab8377c07886ad7b3faade8fc403

Merge remote-tracking branch 'origin/dev' into dev

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/java/com/kidgrow/usercenter/service/impl/SysUserServiceImpl.java

@@ -726,7 +726,7 @@
                    sysDictionaries.setDictionariesKey(DictionariesConstants.DOCTOR_RANK);
                    sysDictionaries.setDictionariesClassId(DictionariesConstants.DOCTOR_RANK_ID.toString());
                    //将名称汉字转为拼音
                    sysDictionaries.setDictionariesKey("");
                    sysDictionaries.setDictionariesKey("temp");
                    sysDictionaries.setDictionariesName(userRegVo.getDoctorRank());
                    sysDictionaries.setCreateUserId(0L);
                    sysDictionaries.setCreateUserName("自动创建");

 kidgrow-springcloud/kidgrow-springcloud-zuul/src/main/resources/application.yml

@@ -186,6 +186,10 @@
      - /*/oauth/**
      - /actuator/health
      - /actuator/info
      - /api-sms/smsChangLan/send
      - /api-user/syshospital/findAllByMap
      - /api-user/sysdictionaries/findAll
      - /api-user/sysdepartment/findListByHospitalId
    # 忽略权限鉴定
    authority-ignores:
      - /*/authority/granted/me
@@ -206,7 +210,11 @@
        /api-uaa/js/**,
        /api-user/users-anon/**,
        /login.html,
        /user/login
        /user/login,
        /api-sms/smsChangLan/send,
        /api-user/syshospital/findAllByMap,
        /api-user/sysdictionaries/findAll,
        /api-user/sysdepartment/findListByHospitalId
    auth:
      #开启时间戳验证
      timestampenable: false

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

@@ -220,7 +220,7 @@
        <div class="layui-form-item">
            <label class="layui-form-label">联系电话</label>
            <div class="layui-input-block">
                <input name="doctorTel"  type="text" class="layui-input" maxlength="20" lay-verify="required|phone" required/>
                <input name="doctorTel" id="doctorTel-add" type="text" class="layui-input" maxlength="20" lay-verify="required|phone" required/>
            </div>
        </div>
        <div class="layui-form-item">
@@ -290,7 +290,7 @@
        <div class="layui-form-item">
            <label class="layui-form-label" >登录帐号</label>
            <div class="layui-input-block">
                <input name="username" id="username" type="text" class="layui-input" maxlength="15" lay-verify="required" required/>
                <input name="username" id="username" readonly type="text" class="layui-input" maxlength="15" lay-verify="required" required/>
            </div>
        </div>
    </div>
@@ -542,6 +542,7 @@
            var doctorName = $('#doctorName').val();
            table.reload('app-table', { where: { doctorState: doctorState, hospitalId: hospitalName, doctorTel: doctorTel, doctorName: doctorName } });
        });
       
        // 显示新增弹窗
        var showEditModel_add = function () {
            layer.open({
@@ -597,6 +598,10 @@
                    $("#username").blur(function () {
                        username_is_usered("username");
                    })
                    $("#doctorTel-add").blur(function () {
                        $("#username").val($("#doctorTel-add").val())
                        username_is_usered("username");
                    })
                }
            });
        };