From d22d599bb3d33ac7e9d860c4cb72c302af24eb66 Mon Sep 17 00:00:00 2001
From: gulnaz <tarkhanova@micord.ru>
Date: Thu, 16 Jan 2025 12:15:23 +0300
Subject: [PATCH] SUPPORT-8846: fix

---
 .../micord/ervu/dto/SubpoenaResponseDto.java  |   2 +-
 .../ts/ervu/component/container/LoadForm.ts   |   1 +
 .../LK RP FL/screen-form-fl.page              | 103 ++++++++++++++++--
 3 files changed, 97 insertions(+), 9 deletions(-)

diff --git a/backend/src/main/java/ru/micord/ervu/dto/SubpoenaResponseDto.java b/backend/src/main/java/ru/micord/ervu/dto/SubpoenaResponseDto.java
index d661d75..5d8d442 100644
--- a/backend/src/main/java/ru/micord/ervu/dto/SubpoenaResponseDto.java
+++ b/backend/src/main/java/ru/micord/ervu/dto/SubpoenaResponseDto.java
@@ -114,7 +114,7 @@ public record SubpoenaResponseDto(String personName, String birthDate, String do
     }
 
     public Builder seriesAndNumber(String series, String number) {
-      this.seriesAndNumber = series + " " + number;
+      this.seriesAndNumber = hasText(number) ? series + " " + number : "";
       return this;
     }
 
diff --git a/frontend/src/ts/ervu/component/container/LoadForm.ts b/frontend/src/ts/ervu/component/container/LoadForm.ts
index f801e9c..3472e78 100644
--- a/frontend/src/ts/ervu/component/container/LoadForm.ts
+++ b/frontend/src/ts/ervu/component/container/LoadForm.ts
@@ -45,6 +45,7 @@ export class LoadForm extends Container {
           fieldData.value = value[field.id];
           this.fieldDataList.push(fieldData);
         });
+        this.loadData();
       }
     });
   }
diff --git a/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page b/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page
index 2b7ff7b..099f115 100644
--- a/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page	
+++ b/resources/src/main/resources/business-model/LK RP FL/screen-form-fl.page	
@@ -1013,6 +1013,12 @@
             </value>
         </item>
     </value>
+</entry>
+<entry>
+    <key>visible</key>
+    <value>
+        <simple>false</simple>
+    </value>
 </entry>
                             </properties>
                         </scripts>
@@ -1820,6 +1826,12 @@
     <value>
         <simple>"Запросить выписку"</simple>
     </value>
+</entry>
+<entry>
+    <key>visible</key>
+    <value>
+        <simple>false</simple>
+    </value>
 </entry>
                             </properties>
                         </scripts>
@@ -4631,6 +4643,12 @@
             </value>
         </item>
     </value>
+</entry>
+<entry>
+    <key>visible</key>
+    <value>
+        <simple>false</simple>
+    </value>
 </entry>
                             </properties>
                         </scripts>
@@ -4723,6 +4741,12 @@
                         <childrenReordered>false</childrenReordered>
                         <scripts id="cf4526a1-96ab-4820-8aa9-62fb54c2b64c">
                             <properties>
+<entry>
+    <key>collectible</key>
+    <value>
+        <simple>false</simple>
+    </value>
+</entry>
 <entry>
     <key>cssClasses</key>
     <value>
@@ -4740,6 +4764,12 @@
     <value>
         <simple>null</simple>
     </value>
+</entry>
+<entry>
+    <key>visible</key>
+    <value>
+        <simple>false</simple>
+    </value>
 </entry>
                             </properties>
                         </scripts>
@@ -4899,6 +4929,12 @@
     <value>
         <simple>"Запросить выписку"</simple>
     </value>
+</entry>
+<entry>
+    <key>visible</key>
+    <value>
+        <simple>false</simple>
+    </value>
 </entry>
                             </properties>
                         </scripts>
@@ -5714,6 +5750,57 @@
             </entry>
         </complex>
     </value>
+</entry>
+                            </complex>
+                        </value>
+                    </item>
+                    <item id="7d9187ca-f2e5-48ff-8670-93d9fc8bcf85" removed="false">
+                        <value>
+                            <complex>
+<entry>
+    <key>_isGroupSelected</key>
+    <value>
+        <simple>false</simple>
+    </value>
+</entry>
+<entry>
+    <key>one</key>
+    <value>
+        <complex>
+            <entry>
+                <key>conditionFirstPart</key>
+                <value>
+                    <complex>
+                        <entry>
+                            <key>objectValue</key>
+                            <value>
+<complex>
+    <entry>
+        <key>behavior</key>
+        <value>
+            <simple>{"objectId":"63871032-9206-4f76-8c93-c8ab1b8200d2","packageName":"component.field","className":"NumberField","type":"TS"}</simple>
+        </value>
+    </entry>
+    <entry>
+        <key>method</key>
+        <value>
+            <simple>"getValue"</simple>
+        </value>
+    </entry>
+</complex>
+                            </value>
+                        </entry>
+                    </complex>
+                </value>
+            </entry>
+            <entry>
+                <key>operation</key>
+                <value>
+                    <simple>"IS_EMPTY"</simple>
+                </value>
+            </entry>
+        </complex>
+    </value>
 </entry>
                             </complex>
                         </value>
@@ -5723,7 +5810,7 @@
             <entry>
                 <key>logicalOperation</key>
                 <value>
-                    <simple>null</simple>
+                    <simple>"OR"</simple>
                 </value>
             </entry>
         </complex>
@@ -7096,7 +7183,7 @@
         <children id="315c5087-825a-4ade-99d9-7dbe09f87226">
             <prototypeId>98594cec-0a9b-4cef-af09-e1b71cb2ad9e</prototypeId>
             <componentRootId>315c5087-825a-4ade-99d9-7dbe09f87226</componentRootId>
-            <name>AC - для ненайденного пользователя в ерву</name>
+            <name>AC - для найденного пользователя в ерву</name>
             <container>false</container>
             <childrenReordered>false</childrenReordered>
             <scripts id="37dff5c8-1599-4984-b107-c44a87b6da2e">
@@ -7196,7 +7283,7 @@
 <entry>
     <key>operation</key>
     <value>
-        <simple>"IS_EMPTY"</simple>
+        <simple>"IS_NOT_EMPTY"</simple>
     </value>
 </entry>
                             </complex>
@@ -7246,7 +7333,7 @@
 <className>boolean</className>
 <packageName></packageName>
                             </implRef>
-                            <simple>false</simple>
+                            <simple>true</simple>
                         </value>
                     </entry>
                 </complex>
@@ -7281,7 +7368,7 @@
 <className>boolean</className>
 <packageName></packageName>
                             </implRef>
-                            <simple>false</simple>
+                            <simple>true</simple>
                         </value>
                     </entry>
                 </complex>
@@ -7316,7 +7403,7 @@
 <className>boolean</className>
 <packageName></packageName>
                             </implRef>
-                            <simple>false</simple>
+                            <simple>true</simple>
                         </value>
                     </entry>
                 </complex>
@@ -7351,7 +7438,7 @@
 <className>boolean</className>
 <packageName></packageName>
                             </implRef>
-                            <simple>false</simple>
+                            <simple>true</simple>
                         </value>
                     </entry>
                 </complex>
@@ -7386,7 +7473,7 @@
 <className>boolean</className>
 <packageName></packageName>
                             </implRef>
-                            <simple>false</simple>
+                            <simple>true</simple>
                         </value>
                     </entry>
                 </complex>