diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java
index 816b1be1..cc3ff37a 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java
@@ -67,6 +67,8 @@ public interface HrmResourceMapper {
SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId);
+ SearchTemplatePO getUsedSerarchTemplateByUser(@Param("userId") Integer userId);
+
SearchTemplatePO getOverallCustomTemplate();
Integer insertSearchTemplate(SearchTemplatePO templatePO);
@@ -77,6 +79,8 @@ public interface HrmResourceMapper {
Integer deleteCustomTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
+ Integer updateCustomTemplateUsed(@Param("userId") Integer userId);
+
String queryLabelName(@Param("fieldName") String fieldName, @Param("scopeId") String scopeId, @Param("language") Integer language);
diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
index 97da4cf8..a5bdb0cd 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
@@ -14,6 +14,9 @@
+
+ update JCL_ORG_SEARCH_TEMPLATE set isused = null where creator = #{userId}
+
+
\ No newline at end of file
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 66cf0d67..10b2acbc 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -273,6 +273,9 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
templatePO.setCreator(user.getUID());
templatePO.setCreateTime(new Date());
templatePO.setUpdateTime(new Date());
+ templatePO.setIsused("1");
+ // 将之前的模板,isused置为null
+ getHrmResourceMapper().updateCustomTemplateUsed(user.getUID());
getHrmResourceMapper().insertSearchTemplate(templatePO);
return templatePO.getId();
}
@@ -635,6 +638,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
btnDatas.put("loginId", user.getUID());
//获取当前用户使用的列定制模板Id
btnDatas.put("customTemplateId", getCustomTemplateId());
+ btnDatas.put("searchTemplateId", getSearchTemplateId());
return btnDatas;
}
@@ -661,6 +665,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
return customTemplateId;
}
+ /**
+ * 获取当前用户使用的查询模板Id
+ *
+ * @return
+ */
+ private String getSearchTemplateId() {
+
+ String searchTemplateId = "-1";
+ SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedSerarchTemplateByUser(user.getUID());
+ if (null != usedCustomTemplate) {
+ searchTemplateId = usedCustomTemplate.getId().toString();
+ }
+
+ return searchTemplateId;
+ }
+
@Override
public Map getTabForm(Map params) {
Map apiDatas = new HashMap<>();