Merge branch 'dev' of http://192.168.2.240:7070/r/kidgrow-microservices-pla...

zhaoxiaohao

2020-08-13 0eb0c43113ed9c4585ba936dcbe87feb4df6ba24

 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">