修复对象判断和下载模板

server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/entity/AitagTagInfoEntity.java

@@ -126,13 +126,17 @@ public class AitagTagInfoEntity {
     }
 
     private boolean isNullOrEmptyEqual(String str1, String str2) {
-        if (isEmpty(str1) && isEmpty(str2)) {
-            return true;
-        }
+        str1 = normalizeString(str1);
+        str2 = normalizeString(str2);
         return Objects.equals(str1, str2);
     }
-    private boolean isEmpty(String str) {
-        return str == null || str.trim().isEmpty();
+    /**
+     * 标准化字符串：null/空/空白字符串都转为 null
+     */
+    private String normalizeString(String str) {
+        if (str == null || str.trim().isEmpty()) {
+            return null;
+        }
+        return str.trim();
     }
-
 }

server/yusp-tagging-core/src/main/java/cn/com/yusys/yusp/domain/vo/ExportDataVo.java

@@ -25,16 +25,16 @@ public class ExportDataVo {
 
 
     /**
-     * 客户经理
+     * 所属行社
      **/
-    @ExcelProperty(value = "法人机构" ,index = 2)
+    @ExcelProperty(value = "所属行社" ,index = 2)
     private String feedbackUserOrg;
 
 
     /**
-     * 客户经理
+     * 所属机构
      **/
-    @ExcelProperty(value = "网点" ,index = 3)
+    @ExcelProperty(value = "所属机构" ,index = 3)
     private String feedbackUserEndpoint;