@@ -145,16 +145,16 @@ public List<MaskingRequest> find(
145145 filters .add (component .get ("system" ).in (systemList ));
146146 }
147147 if (systemId != null ) {
148- filters .add (cb .equal (component .get ("system" ), systemId ));
148+ filters .add (cb .equal (component .get ("system" ). get ( "systemId" ) , systemId ));
149149 }
150150 if (regionId != null ) {
151- filters .add (cb .equal (component .get ("region" ), regionId ));
151+ filters .add (cb .equal (component .get ("region" ). get ( "regionId" ) , regionId ));
152152 }
153153 if (groupId != null ) {
154154 Join <Component , SystemEntity > systems = component .join ("system" );
155155 Join <Category , GroupResponsibility > responsibilities =
156156 systems .join ("groupResponsibilityList" );
157- filters .add (cb .equal (responsibilities .get ("group" ), groupId ));
157+ filters .add (cb .equal (responsibilities .get ("group" ). get ( "groupId" ) , groupId ));
158158 }
159159 if (reason != null && !reason .isEmpty ()) {
160160 filters .add (cb .like (cb .lower (root .get ("requestReason" )), reason .toLowerCase ()));
@@ -235,16 +235,16 @@ public Long count(
235235 filters .add (component .get ("system" ).in (systemList ));
236236 }
237237 if (systemId != null ) {
238- filters .add (cb .equal (component .get ("system" ), systemId ));
238+ filters .add (cb .equal (component .get ("system" ). get ( "systemId" ) , systemId ));
239239 }
240240 if (regionId != null ) {
241- filters .add (cb .equal (component .get ("region" ), regionId ));
241+ filters .add (cb .equal (component .get ("region" ). get ( "regionId" ) , regionId ));
242242 }
243243 if (groupId != null ) {
244244 Join <Component , SystemEntity > systems = component .join ("system" );
245245 Join <Category , GroupResponsibility > responsibilities =
246246 systems .join ("groupResponsibilityList" );
247- filters .add (cb .equal (responsibilities .get ("group" ), groupId ));
247+ filters .add (cb .equal (responsibilities .get ("group" ). get ( "groupId" ) , groupId ));
248248 }
249249 if (reason != null && !reason .isEmpty ()) {
250250 filters .add (cb .like (cb .lower (root .get ("requestReason" )), reason .toLowerCase ()));
0 commit comments