Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platf...

zhaoxiaohao

2020-10-30 c274cc76d294758e24825b727c52635b6103877d

Merge branch 'dev' of ssh://192.168.2.240:29418/kidgrow-microservices-platform into dev

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysDepartmentMapper.xml

@@ -78,7 +78,7 @@
    <select id="checkDepartmentName" resultType="string">
        SELECT org_name FROM sys_organization
WHERE org_parent_id =( SELECT org_id FROM sys_hospital WHERE id = #{hosId} )
AND org_name = #{departmentName}
AND org_name = #{departmentName} AND is_del=0 and enabled=1
    </select>
    <select id="updatePay" resultType="boolean">
        UPDATE sys_department

 kidgrow-business/kidgrow-usercenter/kidgrow-usercenter-biz/src/main/resources/mapper/SysHospitalMapper.xml

@@ -302,7 +302,7 @@
        hospital_name
        from sys_hospital
        where is_del=0 and enabled=1 and hospital_name LIKE concat('%',#{hospitalName},'%')
        order by hospital_name desc
        order by hospital_name desc,id desc
    </select>
    <select id="chartHospital" resultType="int" parameterType="int">
        SELECT

 kidgrow-web/kidgrow-web-manager/src/main/resources/static/module/apiUrl.js

@@ -1,6 +1,11 @@
// var my_api_server_url = 'http://127.0.0.1:8888/';
// var my_api_server_url = 'http://192.168.2.240:8888/';
//var my_api_server_url = 'http://open.zuul.kidgrow.cloud/';
 var my_api_server_url = 'http://zuul.kidgrow.cloud/';
// var my_api_server_url = 'https://zuul.kidgrow.cloud/';
 // var my_api_server_url = 'zuul.kidgrow.cloud/';
var my_api_server_url = 'https://zuul.kidgrow.cloud/';

if(my_api_server_url.indexOf("http")<0)
{
    my_api_server_url=((nowUrl=window.location.href.indexOf("ttps://")>0))?"https://"+my_api_server_url:"http://"+my_api_server_url;
}