快捷搜索自定义接口BUG修复

src/com/engine/organization/mapper/condition/QuickSearchMapper.java

@@ -27,7 +27,7 @@ public interface QuickSearchMapper {
      * @param belongTo 人员ID
      * @return 搜索条件实体
      */
-    List<QuickSearchCondition> getQuickSearchConditionList(@Param("belongTo") Integer belongTo);
+    List<QuickSearchCondition> getQuickSearchConditionList(@Param("belongTo") Integer belongTo, @Param("modelId") Integer modelId);
 
     /**
      * 获取快速搜索选项列表

src/com/engine/organization/mapper/condition/QuickSearchMapper.xml

@@ -14,6 +14,7 @@
         select c.id, fieldid, c.customname, c.type, c.orderid, c.showmodel
         from jcl_quicksearch_condition c
         where belongto = #{belongTo}
+          and modelid = #{modelId}
         order by c.orderid, c.id
     </select>
 
@@ -70,16 +71,10 @@
     </update>
 
     <insert id="insertQuickSearchCondition">
-        insert into jcl_quicksearch_condition(belongto, fieldid, customname, type, orderid, showmodel)
+        insert into jcl_quicksearch_condition(belongto, fieldid, customname, type, orderid, showmodel, modelid)
         values (#{quickSearchCondition.belongTo}, #{quickSearchCondition.fieldId}, #{quickSearchCondition.customName},
-                #{quickSearchCondition.type}, #{quickSearchCondition.orderId}, #{quickSearchCondition.showModel})
+                #{quickSearchCondition.type}, #{quickSearchCondition.orderId}, #{quickSearchCondition.showModel},
-    </insert>
+                #{quickSearchCondition.modelId})
-
-    <insert id="insertQuickSearchDetail">
-        insert into jcl_quicksearch_detail(cid, customname, minnum, maxnum, type, orderid, fieldid, belongto)
-        values (#{quickSearchDetail.cId}, #{quickSearchDetail.customName}, #{quickSearchDetail.minNum},
-                #{quickSearchDetail.maxNum}, #{quickSearchDetail.type}, #{quickSearchDetail.orderId},
-                #{quickSearchDetail.fieldId}, #{quickSearchDetail.belongTo})
     </insert>
 
     <update id="updateQuickSearchCondition">
@@ -89,10 +84,18 @@
             customname=#{quickSearchCondition.customName},
             type=#{quickSearchCondition.type},
             orderid=#{quickSearchCondition.orderId},
-            showmodel=#{quickSearchCondition.showModel}
+            showmodel=#{quickSearchCondition.showModel},
+            modelid = #{quickSearchCondition.modelId}
         where id = #{quickSearchCondition.id}
     </update>
 
+    <insert id="insertQuickSearchDetail">
+        insert into jcl_quicksearch_detail(cid, customname, minnum, maxnum, type, orderid, fieldid, belongto)
+        values (#{quickSearchDetail.cId}, #{quickSearchDetail.customName}, #{quickSearchDetail.minNum},
+                #{quickSearchDetail.maxNum}, #{quickSearchDetail.type}, #{quickSearchDetail.orderId},
+                #{quickSearchDetail.fieldId}, #{quickSearchDetail.belongTo})
+    </insert>
+
     <update id="updateQuickSearchDetail">
         update jcl_quicksearch_detail
         set cid=#{quickSearchDetail.cId},

src/com/engine/organization/service/impl/QuickSearchServiceImpl.java

@@ -5,6 +5,7 @@ import com.alibaba.fastjson.JSONObject;
 import com.cloudstore.dev.api.util.TextUtil;
 import com.engine.core.impl.Service;
 import com.engine.organization.entity.search.*;
+import com.engine.organization.enums.LogModuleNameEnum;
 import com.engine.organization.mapper.condition.QuickSearchMapper;
 import com.engine.organization.service.QuickSearchService;
 import com.engine.organization.util.db.MapperProxyFactory;
@@ -59,7 +60,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
         apiDatas.put("setting", json);
 
         //条件字段查询
-        List<QuickSearchCondition> quickSearchConditionList = getQuickSearchMapper().getQuickSearchConditionList(user.getUID());
+        List<QuickSearchCondition> quickSearchConditionList = getQuickSearchMapper().getQuickSearchConditionList(user.getUID(), LogModuleNameEnum.RESOURCE.getValue());
         JSONArray datas = new JSONArray();
         if (CollectionUtils.isNotEmpty(quickSearchConditionList)) {
             for (QuickSearchCondition quickSearchCondition : quickSearchConditionList) {
@@ -207,7 +208,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
             getQuickSearchMapper().updateQuickSearchSetting(quickSearchSetting);
         }
 
-        List<QuickSearchCondition> quickSearchConditionList = getQuickSearchMapper().getQuickSearchConditionList(user.getUID());
+        List<QuickSearchCondition> quickSearchConditionList = getQuickSearchMapper().getQuickSearchConditionList(user.getUID(),LogModuleNameEnum.RESOURCE.getValue());
         List<Integer> list = quickSearchConditionList.stream().map(QuickSearchCondition::getId).collect(Collectors.toList());
 
         for (int i = 0; i < datas.size(); i++) {
@@ -229,6 +230,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
                         .orderId(StringUtils.isBlank(orderId) ? null : Integer.parseInt(orderId))
                         .showModel(StringUtils.isBlank(showModel) ? null : Integer.parseInt(showModel))
                         .id(cid)
+                        .modelId(LogModuleNameEnum.RESOURCE.getValue())
                         .build();
                 getQuickSearchMapper().updateQuickSearchCondition(quickSearchCondition);
                 if (!fieldId.equals(oriFieldId)) {
@@ -243,6 +245,7 @@ public class QuickSearchServiceImpl extends Service implements QuickSearchServic
                         .type(StringUtils.isBlank(type) ? null : Integer.parseInt(type))
                         .orderId(StringUtils.isBlank(orderId) ? null : Integer.parseInt(orderId))
                         .showModel(StringUtils.isBlank(showModel) ? null : Integer.parseInt(showModel))
+                        .modelId(LogModuleNameEnum.RESOURCE.getValue())
                         .build();
                 getQuickSearchMapper().insertQuickSearchCondition(quickSearchCondition);
             }