Explorar o código

20181214权限

suochencheng %!s(int64=7) %!d(string=hai) anos
pai
achega
506ff7fd8d

+ 36 - 0
src/main/java/com/izouma/awesomeadmin/dao/CommonQueryMapper.xml

@@ -25,6 +25,18 @@
 
                             </foreach>
                         </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
                         <otherwise>
                             <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                                 <if test="detailIndex == 3">
@@ -92,6 +104,18 @@
 
                             </foreach>
                         </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
                         <otherwise>
                             <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                                 <if test="detailIndex == 3">
@@ -162,6 +186,18 @@
 
                         </foreach>
                     </when>
+                    <when test="item.indexOf('in') != -1">
+                        <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                            <if test="detailIndex == 3">
+                                (${itemDetail})
+                            </if>
+
+                            <if test="detailIndex &lt; 3">
+                                ${itemDetail}
+                            </if>
+
+                        </foreach>
+                    </when>
                     <otherwise>
                         <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                             <if test="detailIndex == 3">

+ 36 - 0
src/main/java/com/izouma/awesomeadmin/dao/CommonQuerySqlServerMapper.xml

@@ -23,6 +23,18 @@
 
                             </foreach>
                         </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
                         <otherwise>
                             <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                                 <if test="detailIndex == 3">
@@ -88,6 +100,18 @@
 
                             </foreach>
                         </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
                         <otherwise>
                             <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                                 <if test="detailIndex == 3">
@@ -157,6 +181,18 @@
 
                             </foreach>
                         </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
                         <otherwise>
                             <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                                 <if test="detailIndex == 3">

+ 24 - 0
src/main/java/com/izouma/awesomeadmin/dao/QueryConfigMapper.xml

@@ -227,6 +227,18 @@
 
                             </foreach>
                         </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
                         <otherwise>
                             <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                                 <if test="detailIndex == 3">
@@ -302,6 +314,18 @@
 
                             </foreach>
                         </when>
+                        <when test="item.indexOf('in') != -1">
+                            <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
+                                <if test="detailIndex == 3">
+                                    (${itemDetail})
+                                </if>
+
+                                <if test="detailIndex &lt; 3">
+                                    ${itemDetail}
+                                </if>
+
+                            </foreach>
+                        </when>
                         <otherwise>
                             <foreach item="itemDetail" index="detailIndex" collection="item.split('_,')">
                                 <if test="detailIndex == 3">

+ 1 - 1
src/main/vue/src/pages/CommonQuerys.vue

@@ -170,7 +170,7 @@ export default {
             imageDialogVisible: false,
             showAdvancedQueryDialog: false,
             advancedQueryFields: [],
-            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'like'],
+            searchMethods: ['=', '!=', '>', '>=', '<', '<=', 'in', 'like'],
             searchColumn: '',
             orderByStr: '',
             modules: [],