删除组和角色中的自定义filters条件，保留组织动态条件

maxkey-entity/src/main/java/org/dromara/maxkey/entity/idm/Groups.java

@@ -60,9 +60,6 @@ public class Groups extends JpaEntity implements Serializable {
     
     @Column
     String category;
-
-    @Column
-    String filters ;
     
     @Column
     String orgIdsList;
@@ -200,7 +197,6 @@ public class Groups extends JpaEntity implements Serializable {
     public void setDefaultAllUser() {
         this.category = "dynamic";
         this.orgIdsList ="";
-        this.filters ="";
     }
 
     public String getCategory() {
@@ -211,14 +207,6 @@ public class Groups extends JpaEntity implements Serializable {
         this.category = category;
     }
 
-    public String getFilters() {
-        return filters;
-    }
-
-    public void setFilters(String filters) {
-        this.filters = filters;
-    }
-
     public String getOrgIdsList() {
         return orgIdsList;
     }
@@ -262,8 +250,6 @@ public class Groups extends JpaEntity implements Serializable {
         builder.append(groupName);
         builder.append(", category=");
         builder.append(category);
-        builder.append(", filters=");
-        builder.append(filters);
         builder.append(", orgIdsList=");
         builder.append(orgIdsList);
         builder.append(", isdefault=");

maxkey-entity/src/main/java/org/dromara/maxkey/entity/permissions/Roles.java

@@ -59,9 +59,6 @@ public class Roles extends JpaEntity implements Serializable {
     
     @Column
     String category;
-
-    @Column
-    String filters ;
     
     @Column
     String orgIdsList;
@@ -202,7 +199,6 @@ public class Roles extends JpaEntity implements Serializable {
     public void setDefaultAllUser() {
         this.category = Category.DYNAMIC;
         this.orgIdsList ="";
-        this.filters ="";
     }
 
     public String getCategory() {
@@ -213,14 +209,6 @@ public class Roles extends JpaEntity implements Serializable {
         this.category = category;
     }
 
-    public String getFilters() {
-        return filters;
-    }
-
-    public void setFilters(String filters) {
-        this.filters = filters;
-    }
-
     public String getOrgIdsList() {
         return orgIdsList;
     }
@@ -272,8 +260,6 @@ public class Roles extends JpaEntity implements Serializable {
         builder.append(roleName);
         builder.append(", category=");
         builder.append(category);
-        builder.append(", filters=");
-        builder.append(filters);
         builder.append(", orgIdsList=");
         builder.append(orgIdsList);
         builder.append(", isdefault=");

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/GroupsServiceImpl.java

@@ -66,18 +66,6 @@ public class GroupsServiceImpl  extends JpaServiceImpl<GroupsMapper,Groups,Strin
                 dynamicGroup.setOrgIds(StrUtils.string2List(dynamicGroup.getOrgIdsList(), ","));
                 _logger.debug("OrgIds {}" , dynamicGroup.getOrgIds());
             }
-            String filters = dynamicGroup.getFilters();
-            if(StringUtils.isNotBlank(filters)) {
-                if(StrUtils.filtersSQLInjection(filters.toLowerCase())) {  
-                    _logger.info("filters include SQL Injection Attack Risk.");
-                    return;
-                }
-                //replace & with AND, | with OR
-                filters = filters.replace("&", " AND ").replace("|", " OR ");
-                
-                dynamicGroup.setFilters(filters);
-            }
-        
             groupMemberService.deleteDynamicMember(dynamicGroup);
             groupMemberService.addDynamicMember(dynamicGroup);
             

maxkey-persistence/src/main/java/org/dromara/maxkey/persistence/service/impl/RolesServiceImpl.java

@@ -68,20 +68,6 @@ public class RolesServiceImpl  extends JpaServiceImpl<RolesMapper,Roles,String>
         		dynamicRole.setOrgIds(StrUtils.string2List(dynamicRole.getOrgIdsList(), ","));
                 _logger.debug("OrgIds {}" , dynamicRole.getOrgIds());
             }
-            String filters = dynamicRole.getFilters();
-            _logger.debug("filters {}" , filters);
-            if(StringUtils.isNotBlank(filters)) {
-                if(StrUtils.filtersSQLInjection(filters.toLowerCase())) {  
-                    _logger.info("filters include SQL Injection Attack Risk.");
-                    return;
-                }
-                //replace & with AND, | with OR
-                filters = filters.replace("&", " AND ").replace("\\|", " OR ");
-                
-                _logger.debug("set filters {}" , filters);
-                dynamicRole.setFilters(filters);
-            }
-        
             roleMemberService.deleteDynamicRoleMember(dynamicRole);
             roleMemberService.addDynamicRoleMember(dynamicRole);
         

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/highgo/GroupMemberMapper.xml

@@ -226,12 +226,13 @@
 					and gm.memberid=u.id
 					and gm.type='USER-DYNAMIC'
 			)
-		<if test="filters != null and filters != ''">
-				and (${filters})
-		</if>
-		<if test="orgIdsList != null and orgIdsList != ''">
-				and u.departmentid in( ${orgIdsList})
-		</if>
+			<if test="orgIds != null and orgIds.size() > 0">
+					and u.departmentid in ( 
+					<foreach collection="orgIds" item="item" separator=",">
+	                    #{item}
+	                </foreach>
+					)
+			</if>
     </update>
     
     <delete id="deleteDynamicGroupMember" parameterType="Groups" >
@@ -243,11 +244,12 @@
 		    	from mxk_userinfo u
 		    	where 1 = 1 
 		    		and u.id=gm.memberid
-				<if test="filters != null and filters != ''">
-						and (${filters})
-				</if>
-				<if test="orgIdsList != null and orgIdsList != ''">
-						and u.departmentid in ( ${orgIdsList})
+				<if test="orgIds != null and orgIds.size() > 0">
+						and u.departmentid in ( 
+						<foreach collection="orgIds" item="item" separator=",">
+		                    #{item}
+		                </foreach>
+						)
 				</if>
 			)
     </delete>

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/highgo/RoleMemberMapper.xml

@@ -227,12 +227,13 @@
 					and rm.memberid=u.id
 					and rm.type='USER-DYNAMIC'
 			)
-		<if test="filters != null and filters != ''">
-				${filters}
-		</if>
-		<if test="orgIdsList != null and orgIdsList != ''">
-				and u.departmentid in( ${orgIdsList})
-		</if>
+			<if test="orgIds != null and orgIds.size() > 0">
+					and u.departmentid in ( 
+					<foreach collection="orgIds" item="item" separator=",">
+	                    #{item}
+	                </foreach>
+					)
+			</if>
     </update>
     
     <delete id="deleteDynamicRoleMember" parameterType="Roles" >
@@ -244,11 +245,12 @@
 		    	from mxk_userinfo u
 		    	where 1 = 1 
 		    		and u.id=rm.memberid
-				<if test="filters != null and filters != ''">
-						${filters}
-				</if>
-				<if test="orgIdsList != null and orgIdsList != ''">
-						and u.departmentid in( ${orgIdsList})
+				<if test="orgIds != null and orgIds.size() > 0">
+						and u.departmentid in ( 
+						<foreach collection="orgIds" item="item" separator=",">
+		                    #{item}
+		                </foreach>
+						)
 				</if>
 			)
     </delete>

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/GroupMemberMapper.xml

@@ -205,9 +205,6 @@
 					and gm.memberid=u.id
 					and gm.type='USER-DYNAMIC'
 			)
-		<if test="filters != null and filters != ''">
-				and (${filters})
-		</if>
 		<if test="orgIds != null and orgIds.size() > 0">
 				and u.departmentid in( 
 				<foreach collection="orgIds" item="item" separator=",">
@@ -226,9 +223,6 @@
 		    	from mxk_userinfo u
 		    	where 1 = 1 
 		    		and u.id=gm.memberid
-				<if test="filters != null and filters != ''">
-						and (${filters})
-				</if>
 				<if test="orgIds != null and orgIds.size() > 0">
 						and u.departmentid in ( 
 						<foreach collection="orgIds" item="item" separator=",">

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/mysql/RoleMemberMapper.xml

@@ -152,9 +152,6 @@
 					and rm.memberid=u.id
 					and rm.type='USER-DYNAMIC'
 			)
-		<if test="filters != null and filters != ''">
-				and (${filters})
-		</if>
 		<if test="orgIds != null and orgIds.size() > 0">
 				and u.departmentid in(
 				<foreach collection="orgIds" item="item" separator=",">
@@ -173,9 +170,6 @@
 		    	from mxk_userinfo u
 		    	where 1 = 1 
 		    		and u.id=rm.memberid
-				<if test="filters != null and filters != ''">
-						and (${filters})
-				</if>
 				<if test="orgIds != null and orgIds.size() > 0">
 						and u.departmentid in ( 
 						<foreach collection="orgIds" item="item" separator=",">

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/postgresql/AccountsMapper.xml

@@ -39,12 +39,13 @@
         and ac.userid = u.id
         and ac.createtype='automatic'
         )
-        <if test="filters != null and filters != ''">
-            and (${filters})
-        </if>
-        <if test="orgIdsList != null and orgIdsList != ''">
-            and u.departmentid in( ${orgIdsList})
-        </if>
+        <if test="orgIds != null and orgIds.size() > 0">
+				and u.departmentid in ( 
+				<foreach collection="orgIds" item="item" separator=",">
+	                #{item}
+	            </foreach>
+				)
+		</if>
     </select>
 
     <delete id="deleteByStrategy" parameterType="AccountsStrategy">
@@ -58,12 +59,13 @@
         from mxk_userinfo u
         where instid = #{instId}
         and u.id=ac.userid
-        <if test="filters != null and filters != ''">
-            and (${filters})
-        </if>
-        <if test="orgIdsList != null and orgIdsList != ''">
-            and u.departmentid in ( ${orgIdsList})
-        </if>
+        <if test="orgIds != null and orgIds.size() > 0">
+				and u.departmentid in ( 
+				<foreach collection="orgIds" item="item" separator=",">
+                    #{item}
+                </foreach>
+				)
+		</if>
         )
     </delete>
 </mapper>

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/postgresql/GroupMemberMapper.xml

@@ -218,12 +218,13 @@
         and gm.memberid=u.id
         and gm.type='USER-DYNAMIC'
         )
-        <if test="filters != null and filters != ''">
-            and (${filters})
-        </if>
-        <if test="orgIdsList != null and orgIdsList != ''">
-            and u.departmentid in( ${orgIdsList})
-        </if>
+        <if test="orgIds != null and orgIds.size() > 0">
+				and u.departmentid in ( 
+				<foreach collection="orgIds" item="item" separator=",">
+                    #{item}
+                </foreach>
+				)
+		</if>
     </update>
 
     <delete id="deleteDynamicGroupMember" parameterType="Groups">
@@ -235,12 +236,13 @@
         from mxk_userinfo u
         where 1 = 1
         and u.id=gm.memberid
-        <if test="filters != null and filters != ''">
-            and (${filters})
-        </if>
-        <if test="orgIdsList != null and orgIdsList != ''">
-            and u.departmentid in ( ${orgIdsList})
-        </if>
+        <if test="orgIds != null and orgIds.size() > 0">
+				and u.departmentid in ( 
+				<foreach collection="orgIds" item="item" separator=",">
+                    #{item}
+                </foreach>
+				)
+		</if>
         )
     </delete>
 

maxkey-persistence/src/main/resources/org/dromara/maxkey/persistence/mapper/xml/postgresql/RoleMemberMapper.xml

@@ -220,12 +220,13 @@
         and rm.memberid=u.id
         and rm.type='USER-DYNAMIC'
         )
-        <if test="filters != null and filters != ''">
-            ${filters}
-        </if>
-        <if test="orgIdsList != null and orgIdsList != ''">
-            and u.departmentid in( ${orgIdsList})
-        </if>
+        <if test="orgIds != null and orgIds.size() > 0">
+				and u.departmentid in ( 
+				<foreach collection="orgIds" item="item" separator=",">
+                    #{item}
+                </foreach>
+				)
+		</if>
     </update>
 
     <delete id="deleteDynamicRoleMember" parameterType="Roles">
@@ -237,12 +238,13 @@
         from mxk_userinfo u
         where 1 = 1
         and u.id=rm.memberid
-        <if test="filters != null and filters != ''">
-            ${filters}
-        </if>
-        <if test="orgIdsList != null and orgIdsList != ''">
-            and u.departmentid in( ${orgIdsList})
-        </if>
+        <if test="orgIds != null and orgIds.size() > 0">
+				and u.departmentid in ( 
+				<foreach collection="orgIds" item="item" separator=",">
+                    #{item}
+                </foreach>
+				)
+		</if>
         )
     </delete>
 

maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Groups.ts

@@ -22,7 +22,6 @@ export class Groups extends BaseEntity {
   groupCode!: String;
   groupName!: String;
   category!: String;
-  filters!: String;
   orgIdsList!: String;
   isdefault!: String;
 

maxkey-web-frontend/maxkey-web-mgt-app/src/app/entity/Roles.ts

@@ -24,7 +24,6 @@ export class Roles extends BaseEntity {
   appId!: String;
   appName!: String;
   category!: String;
-  filters!: String;
   orgIdsList!: String;
   isdefault!: String;
 

maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/idm/groups/group-editer/group-editer.component.html

@@ -52,20 +52,6 @@
         </nz-tree-select>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item *ngIf="form.model.category == 'dynamic'">
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="filters">{{ 'mxk.groups.filters' | i18n }}</nz-form-label>
-      <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid filters!">
-        <textarea
-          rows="4"
-          nz-input
-          [(ngModel)]="form.model.filters"
-          [ngModelOptions]="{ standalone: true }"
-          nz-input
-          name="filters"
-          id="filters"
-        ></textarea>
-      </nz-form-control>
-    </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="description">{{ 'mxk.text.description' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid encoding!">

maxkey-web-frontend/maxkey-web-mgt-app/src/app/routes/permissions/roles/role-editer/role-editer.component.html

@@ -75,20 +75,6 @@
         </nz-tree-select>
       </nz-form-control>
     </nz-form-item>
-    <nz-form-item *ngIf="form.model.category == 'dynamic'">
-      <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="filters">{{ 'mxk.roles.filters' | i18n }}</nz-form-label>
-      <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid filters!">
-        <textarea
-          rows="4"
-          nz-input
-          [(ngModel)]="form.model.filters"
-          [ngModelOptions]="{ standalone: true }"
-          nz-input
-          name="filters"
-          id="filters"
-        ></textarea>
-      </nz-form-control>
-    </nz-form-item>
     <nz-form-item>
       <nz-form-label [nzSm]="6" [nzXs]="24" nzFor="description">{{ 'mxk.text.description' | i18n }}</nz-form-label>
       <nz-form-control [nzSm]="18" [nzXs]="24" nzErrorTip="The input is not valid encoding!">