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 95d5da9a..572db925 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,7 +9,10 @@
 	
 	<!-- 根据权限sql查询数据集 20230904 内部写法，调用位置installAuthJdbc，暂不处理sql注入问题-->
 	<select id="queryListWithPermission" parameterType="Object" resultType="org.jeecg.modules.demo.test.entity.JeecgDemo">
-		select * from demo where 1=1 ${permissionSql}
+		select * from demo
+        <where>
+            ${permissionSql}
+        </where>
 	</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 597d677a..b0b83ae3 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,11 +161,6 @@
     <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}
@@ -174,6 +169,9 @@
                 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 ae0c60ae..95165367 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">
-				   <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" >
+			   <where>
+				   <!-- 父ID条件 -->
+				   <if test="query == null">
 					   <choose>
-						   <when test="key == 'tenant_id'">
-							   and tenant_id = #{value}
+						   <when test="pid != null and pid != ''">
+							   ${pidField} = #{pid}
 						   </when>
 						   <otherwise>
-							   and ${key} LIKE #{value}
+							   (${pidField} = '' OR ${pidField} IS NULL)
 						   </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>
+				   </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>
 	</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 104d79a9..29a52b71 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,15 +28,16 @@
                    ,icon
                    ,is_leaf
 		   FROM   sys_permission
-		   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>
+		   <where>
+				<choose>
+					<when test="parentId != null and parentId != ''">
+						AND parent_id =  #{parentId,jdbcType=VARCHAR}
+					</when>
+					<otherwise>
+						AND parent_id is null
+					</otherwise>
+				</choose>
+		   </where>
 	</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 fe909824..ec02bfc8 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,15 +4,16 @@
 
     <select id="listAllSysRole" resultType="org.jeecg.modules.system.entity.SysRole">
         SELECT * from sys_role
-        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>
+        <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>
     </select>