From a3380ce0bd562c2da0a1090ce003bae71ca06af7 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Wed, 16 Aug 2023 16:40:11 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BA=BA=E5=91=98=E5=BF=AB=E6=8D=B7=E6=90=9C?=
 =?UTF-8?q?=E7=B4=A2BUG=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../mapper/condition/QuickSearchMapper.java   | 13 ++++++++--
 .../mapper/condition/QuickSearchMapper.xml    | 26 +++++++++++++++----
 .../service/impl/HrmResourceServiceImpl.java  |  2 +-
 .../service/impl/QuickSearchServiceImpl.java  |  6 +++--
 4 files changed, 37 insertions(+), 10 deletions(-)

diff --git a/src/com/engine/organization/mapper/condition/QuickSearchMapper.java b/src/com/engine/organization/mapper/condition/QuickSearchMapper.java
index 86e9323a..dc5e04e6 100644
--- a/src/com/engine/organization/mapper/condition/QuickSearchMapper.java
+++ b/src/com/engine/organization/mapper/condition/QuickSearchMapper.java
@@ -32,6 +32,14 @@ public interface QuickSearchMapper {
      */
     List<QuickSearchCondition> getQuickSearchConditionList(@Param("belongTo") Integer belongTo, @Param("modelId") Integer modelId);
 
+    /**
+     * 获取快速搜索条件
+     *
+     * @param id id
+     * @return return
+     */
+    QuickSearchCondition getQuickSearchConditionById(@Param("id") String id);
+
     /**
      * 获取快速搜索选项列表
      *
@@ -115,10 +123,11 @@ public interface QuickSearchMapper {
     /**
      * 按条件Id获取快速搜索字段列表
      *
-     * @param id 条件Id
+     * @param fieldName 字段名称
+     * @param scopeId scopeId
      * @return return
      */
-    List<QuickSearchField> getQuickSearchFieldListByConditionId(@Param("id") String id);
+    QuickSearchField getQuickSearchFieldListByConditionId(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId);
 
     /**
      * 更新快速搜索详细信息
diff --git a/src/com/engine/organization/mapper/condition/QuickSearchMapper.xml b/src/com/engine/organization/mapper/condition/QuickSearchMapper.xml
index af2ed2bf..50afdace 100644
--- a/src/com/engine/organization/mapper/condition/QuickSearchMapper.xml
+++ b/src/com/engine/organization/mapper/condition/QuickSearchMapper.xml
@@ -18,6 +18,13 @@
         order by c.orderid, c.id
     </select>
 
+    <select id="getQuickSearchConditionById"
+            resultType="com.engine.organization.entity.search.QuickSearchCondition">
+        select c.id, fieldid, c.customname, c.type, c.orderid, c.showmodel
+        from jcl_quicksearch_condition c
+        where id = #{id}
+    </select>
+
     <select id="getQuickSearchOptionList" resultType="com.engine.organization.entity.search.QuickSearchOption">
         select b.fieldid, b.fieldlabel, b.fieldname, fieldhtmltype, b.type
         from hrm_formfield b
@@ -53,10 +60,19 @@
 
     <select id="getQuickSearchFieldListByConditionId"
             resultType="com.engine.organization.entity.search.QuickSearchField">
-        select b.fieldhtmltype, b.type, b.fielddbtype
-        from jcl_quicksearch_condition c
-                 left join hrm_formfield b on b.fieldid = c.fieldid
-        where c.id = #{id}
+        SELECT *
+        FROM (SELECT t2.fielddbtype, t2.fieldhtmltype, t2.type, t1.scopeid as scopeId, t2.fieldname
+              FROM cus_formfield t1,
+                   cus_formdict t2
+              WHERE t1.fieldid = t2.id
+                AND t1.scope = 'HrmCustomFieldByInfoType'
+              UNION ALL
+              SELECT t3.fielddbtype, t3.fieldhtmltype, t3.TYPE, c.grouptype as scopeId, t3.fieldname
+              FROM hrm_formfield t3
+                       inner join hrm_fieldgroup c on c.id = t3.groupid and c.grouptype in (-1, 1, 3)) hrmallfield
+        WHERE FIELDHTMLTYPE != '6'
+          and fieldname = #{fieldName}
+          and scopeId = #{scopeId}
     </select>
     <select id="getHrmFormFieldByFieldId"
             resultType="com.engine.organization.entity.jclimport.po.HrmFormFieldPO">
@@ -100,7 +116,7 @@
               UNION ALL
               SELECT t3.fieldid,
                      t3.fieldname,
-                     t3.fieldlabel fieldLabel,
+                     t3.fieldlabel  fieldLabel,
                      t3.ismand,
                      t3.fielddbtype,
                      t3.fieldhtmltype,
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index ba3bd722..0b3a62ce 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -1187,7 +1187,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                     if (StringUtils.isNotBlank(value) && !"-1".equals(value) && !"0,,".equals(value) && !"0".equals(value)) {
                         if (!"6".equals(value)) {
                             if ("1".equals(value)) {
-                                sb.append(" and ").append(tableSql).append(" = '").append(OrganizationDateUtil.getFormatLocalDate(LocalDate.now())).append(" '");
+                                sb.append(" and ").append(tableSql).append(" = '").append(OrganizationDateUtil.getFormatLocalDate(LocalDate.now())).append("'");
                             }else {
                                 sb.append(" and ").append(tableSql).append(" >= '").append(TimeUtil.getDateByOption(value, "0")).append(" 00:00:00'");
                                 sb.append(" and ").append(tableSql).append(" <= '").append(TimeUtil.getDateByOption(value, "")).append(" 23:59:59'");
diff --git a/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java b/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java
index e67399ed..3aa3d0eb 100644
--- a/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java
+++ b/src/com/engine/organization/service/impl/QuickSearchServiceImpl.java
@@ -359,9 +359,11 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
             obj.put("orderid", orderId);
             datas.add(obj);
         }
-        List<QuickSearchField> quickSearchFieldList = getQuickSearchMapper().getQuickSearchFieldListByConditionId(cid);
+        QuickSearchCondition quickSearchConditionById = getQuickSearchMapper().getQuickSearchConditionById(cid);
+        String[] split = quickSearchConditionById.getFieldId().split("_");
         int precision = 0;
-        for (QuickSearchField quickSearchField : quickSearchFieldList) {
+        if(split.length==3) {
+            QuickSearchField quickSearchField = getQuickSearchMapper().getQuickSearchFieldListByConditionId(split[2], split[0]);
             String fieldHtmlType = quickSearchField.getFieldHtmlType();
             String type = quickSearchField.getType();
             String fieldDbType = quickSearchField.getFieldDbType();