数据去重 医院端修改添加组织

zhaoxiaohao

2020-07-22 0930a9b75df70289da7188ba65b183e012a9d692

数据去重    医院端修改添加组织

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderDetailMapper.xml

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderDetailMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
       DISTINCT *
    </sql>

    <!--sql查询片段-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderMapper.xml

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
      DISTINCT *
    </sql>

    <!--sql查询片段-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/ProductOrderRecordMapper.xml

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.ProductOrderRecordMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
      DISTINCT *
    </sql>

    <!--sql查询片段-->

 kidgrow-business/kidgrow-opration-center/kidgrow-opration-center-biz/src/main/resources/mapper/SysProductMapper.xml

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.oprationcenter.mapper.SysProductMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
      DISTINCT *
    </sql>
    <!--定义数据权限的查询-->
    <sql id="Role_Organization">

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

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.usercenter.mapper.SysCompanyMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
       DISTINCT *
    </sql>

    <!--sql查询片段-->

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

@@ -4,7 +4,7 @@
<mapper namespace="com.kidgrow.usercenter.mapper.SysDoctorMapper">
    <!--定义查询列-->
    <sql id="Column_List">
       *
      DISTINCT *
    </sql>

    <!--sql查询片段-->

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

@@ -163,10 +163,9 @@
                        <choose>
                            <when test="inx == 1">
                                <if test="itemto.flag">
                                    and 1=1
                                </if>
                                <if test="!itemto.flag">
                                    or (1=1 and HOS.is_del = 0 and HOS.enabled=1)
                                    or ( HOS.is_del = 0 and HOS.enabled=1)
                                </if>
                            </when>
                            <when test="inx==2">
@@ -226,6 +225,7 @@
    </sql>
    <select id="findHospitalList" resultType="com.kidgrow.usercenter.vo.HospitalListVo">
        SELECT
        DISTINCT
        DEP.department_name,
        DEP.id department_id,
        DEP.server_user_name,

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

@@ -11,10 +11,10 @@
                    <choose>
                        <when test="inx == 1">
                            <if test="itemto.flag">
                                and 1=1

                            </if>
                            <if test="!itemto.flag">
                                or (1=1 and is_del = 0 and enabled=1)
                                or ( is_del = 0 and enabled=1)
                            </if>
                        </when>
                        <when test="inx==2">

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

@@ -173,7 +173,7 @@
            } else {
                sysOrganization.setOrgName(sysHospital.getHospitalName());
            }
            boolean org = organizationService.saveOrUpdate(sysOrganization);
            boolean org = organizationService.saveOrUpdateSer(sysOrganization);
            sysHospital.setOrgId(sysOrganization.getId());
            List<SysOrganization> organizations = sysUser.getOrganizations();
            if (organizations.size() > 0) {