diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
index 432e2ba2..bfd7213d 100644
--- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
+++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
@@ -32,7 +32,7 @@
     <select id="listAllByCreator" resultMap="BaseResultMap">
         select
         <include refid="Base_Column_List" />
-        from jcl_org_custom_template where creator = #{creator} order by id
+        from jcl_org_custom_template where creator = #{creator}  order by id
     </select>
 
     <delete id="deleteByPrimaryKey" parameterType="java.lang.Long">
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index 10b2acbc..128e0f1d 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -344,10 +344,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             templates.add(0, SearchTemplateParam.builder().key("-1").showname("默认模板").build());
         }
 
-        //1.增加全局模板
-        if (userUID != 1) {
-            templates.addAll(getHrmResourceMapper().getCustomOverAll());
-        }
         LinkedHashSet<Object> objects = new LinkedHashSet<>(templates);
         returnMap.put("templates", objects);
         return returnMap;
@@ -725,11 +721,19 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         Map<String, Object> tabInfoMap = new HashMap<>();
         tabInfoMap.put("columns", ExtendInfoBO.convertInfoListToTable(user, infoPOList, false, true));
         List<JclOrgCustomTemplatePO> jclOrgCustomTemplatePOS = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).listAllByCreator(user.getUID());
+        //获取当前使用的模板过滤掉
+        String customTemplateId = getCustomTemplateId();
+        jclOrgCustomTemplatePOS = jclOrgCustomTemplatePOS.stream()
+                .filter(item -> !customTemplateId.equals(String.valueOf(item.getId())))
+                .collect(Collectors.toList());
+
         List<Integer> isUsed = new ArrayList<>();
         AtomicInteger index = new AtomicInteger(0);
         List<Map<String, Object>> collect = jclOrgCustomTemplatePOS.stream().map(item -> {
             Map<String, Object> resultMap = new HashMap<>();
             resultMap.put("id", item.getId());
+            resultMap.put("viewAttr", 1);
+            resultMap.put("editTable", false);
             resultMap.put("name", item.getName());
             resultMap.put("createTime", DateUtil.getDate(item.getCreateTime(), "yyyy-MM-dd"));