From ee4ff35c90cb8cfe256a58679407efa3a94fbaab Mon Sep 17 00:00:00 2001
From: EightMonth <eightmonth@qq.com>
Date: Wed, 3 Apr 2024 16:04:29 +0800
Subject: [PATCH] =?UTF-8?q?Revert=20"=E4=BF=AE=E5=A4=8D=20#6070"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

This reverts commit 6edef14f07aac58430451652f576ecdc41d77ed1.
---
 .../demo/test/mapper/xml/JeecgDemoMapper.xml  |  5 +-
 .../system/mapper/xml/SysDepartMapper.xml     |  8 ++-
 .../system/mapper/xml/SysDictMapper.xml       | 60 +++++++++----------
 .../system/mapper/xml/SysPermissionMapper.xml | 19 +++---
 .../system/mapper/xml/SysRoleMapper.xml       | 19 +++---
 5 files changed, 54 insertions(+), 57 deletions(-)

diff --git a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
index 572db925..95d5da9a 100644
--- a/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
+++ b/jeecg-module-demo/src/main/java/org/jeecg/modules/demo/test/mapper/xml/JeecgDemoMapper.xml
@@ -9,10 +9,7 @@
 	
 	<!-- 根据权限sql查询数据集 20230904 内部写法，调用位置installAuthJdbc，暂不处理sql注入问题-->
 	<select id="queryListWithPermission" parameterType="Object" resultType="org.jeecg.modules.demo.test.entity.JeecgDemo">
-		select * from demo
-        <where>
-            ${permissionSql}
-        </where>
+		select * from demo where 1=1 ${permissionSql}
 	</select>
 
 	<!-- 查询所有符合前缀且有效字段 -->
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
index b0b83ae3..597d677a 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDepartMapper.xml
@@ -161,6 +161,11 @@
     <select id="getSysDepartList" resultType="org.jeecg.modules.system.vo.SysDepartExportVo">
         SELECT id,depart_name,parent_id,depart_name_en,depart_order,description,org_category,org_code,mobile,fax,address,memo FROM sys_depart
         WHERE
+        1=1
+        <if test="null != tenantId and 0 != tenantId">
+            AND tenant_id = #{tenantId}
+        </if>  
+        AND
         <choose>
             <when test="parentId != null and parentId != ''">
                 parent_id = #{parentId}
@@ -169,9 +174,6 @@
                 parent_id IS NULL OR parent_id=''
             </otherwise>
         </choose>
-        <if test="null != tenantId and 0 != tenantId">
-            AND tenant_id = #{tenantId}
-        </if>  
         ORDER BY depart_order DESC
     </select>
 </mapper>
\ No newline at end of file
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
index 95165367..ae0c60ae 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysDictMapper.xml
@@ -127,41 +127,41 @@
 			   </if>
 			   ${pidField} as parentId
 			   from ${table}
-			   <where>
-				   <!-- 父ID条件 -->
-				   <if test="query == null">
+			   where
+		       <!-- 父ID条件 -->
+			   <if test="query == null">
+				   <choose>
+					   <when test="pid != null and pid != ''">
+						   ${pidField} = #{pid}
+					   </when>
+					   <otherwise>
+						   (${pidField} = '' OR ${pidField} IS NULL)
+					   </otherwise>
+				   </choose>
+			   </if>
+			   <!-- 查询条件组装 -->
+			   <if test="query!= null">
+			       1 = 1
+				   <foreach collection="query.entrySet()" item="value"  index="key" >
 					   <choose>
-						   <when test="pid != null and pid != ''">
-							   ${pidField} = #{pid}
+						   <when test="key == 'tenant_id'">
+							   and tenant_id = #{value}
 						   </when>
 						   <otherwise>
-							   (${pidField} = '' OR ${pidField} IS NULL)
+							   and ${key} LIKE #{value}
 						   </otherwise>
 					   </choose>
-				   </if>
-				   <!-- 查询条件组装 -->
-				   <if test="query!= null">
-					   <foreach collection="query.entrySet()" item="value"  index="key" >
-						   <choose>
-							   <when test="key == 'tenant_id'">
-								   and tenant_id = #{value}
-							   </when>
-							   <otherwise>
-								   and ${key} LIKE #{value}
-							   </otherwise>
-						   </choose>
-					   </foreach>
-						 <!-- 【issues/3709】自定义树查询条件没有处理父ID，没有树状结构了 -->
-						 <choose>
-							 <when test="pid != null and pid != ''">
-								 and ${pidField} = #{pid}
-							 </when>
-							 <otherwise>
-								 and (${pidField} = '' OR ${pidField} IS NULL)
-							 </otherwise>
-						 </choose>
-				   </if>
-			   </where>
+				   </foreach>
+					 <!-- 【issues/3709】自定义树查询条件没有处理父ID，没有树状结构了 -->
+					 <choose>
+						 <when test="pid != null and pid != ''">
+							 and ${pidField} = #{pid}
+						 </when>
+						 <otherwise>
+							 and (${pidField} = '' OR ${pidField} IS NULL)
+						 </otherwise>
+					 </choose>
+			   </if>
 	</select>
 
 	<!-- 分页查询字典表数据，支持text或code模糊查询匹配【已加入SQL注入check】 -->
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
index 29a52b71..104d79a9 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysPermissionMapper.xml
@@ -28,16 +28,15 @@
                    ,icon
                    ,is_leaf
 		   FROM   sys_permission
-		   <where>
-				<choose>
-					<when test="parentId != null and parentId != ''">
-						AND parent_id =  #{parentId,jdbcType=VARCHAR}
-					</when>
-					<otherwise>
-						AND parent_id is null
-					</otherwise>
-				</choose>
-		   </where>
+		   WHERE 1=1
+		    <choose>
+		   		<when test="parentId != null and parentId != ''">
+		   			AND parent_id =  #{parentId,jdbcType=VARCHAR}
+		   		</when>
+		   		<otherwise>
+		   			AND parent_id is null
+		   		</otherwise>
+		    </choose>
 	</select>
 	
 	<!-- 获取登录用户拥有的权限 -->
diff --git a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml
index ec02bfc8..fe909824 100644
--- a/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml
+++ b/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/mapper/xml/SysRoleMapper.xml
@@ -4,16 +4,15 @@
 
     <select id="listAllSysRole" resultType="org.jeecg.modules.system.entity.SysRole">
         SELECT * from sys_role
-        <where>
-            <if test="role.roleName!='' and role.roleName!=null">
-                <bind name="bindKeyword" value="'%'+role.roleName+'%'"/>
-                AND role_name like #{bindKeyword}
-            </if>
-            <if test="role.roleCode!='' and role.roleCode!=null">
-                <bind name="bindRoleCode" value="'%'+role.roleCode+'%'"/>
-                AND role_code like #{bindRoleCode}
-            </if>
-        </where>
+        WHERE 1=1
+        <if test="role.roleName!='' and role.roleName!=null">
+            <bind name="bindKeyword" value="'%'+role.roleName+'%'"/>
+            AND role_name like #{bindKeyword}
+        </if>
+        <if test="role.roleCode!='' and role.roleCode!=null">
+            <bind name="bindRoleCode" value="'%'+role.roleCode+'%'"/>
+            AND role_code like #{bindRoleCode}
+        </if>
     </select>