diff --git a/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java b/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java
index 4393a206..6fd748ca 100644
--- a/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java
+++ b/src/com/engine/organization/entity/hrmresource/po/SearchTemplatePO.java
@@ -26,4 +26,5 @@ public class SearchTemplatePO {
     private Integer creator;
     private Date createTime;
     private Date updateTime;
+    private Integer overall;
 }
diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java
index 5e6039bc..816b1be1 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.java
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.java
@@ -55,6 +55,8 @@ public interface HrmResourceMapper {
      */
     List<SearchTemplateParam> getCustomTemplatesByUser(@Param("userId") Integer userId);
 
+    List<SearchTemplateParam> getCustomOverAll();
+
     SearchTemplatePO getSearchTemplateById(@Param("id") String id);
 
     SearchTemplatePO getSearchTemplateByName(@Param("userId") Integer userId, @Param("name") String name);
@@ -65,6 +67,8 @@ public interface HrmResourceMapper {
 
     SearchTemplatePO getUsedCustomTemplateByUser(@Param("userId") Integer userId);
 
+    SearchTemplatePO getOverallCustomTemplate();
+
     Integer insertSearchTemplate(SearchTemplatePO templatePO);
 
     Integer deleteSearchTemplate(@Param("id") Integer Id, @Param("userId") Integer userId);
diff --git a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
index 8097bea6..fd4847dc 100644
--- a/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
+++ b/src/com/engine/organization/mapper/resource/HrmResourceMapper.xml
@@ -150,6 +150,13 @@
         where creator = #{userId}
     </select>
 
+    <select id="getCustomOverAll" resultMap="SearchTemplateMap">
+        select id,
+               name
+        from jcl_org_custom_template
+        where overall = 1
+    </select>
+
     <insert id="insertSearchTemplate" parameterType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO"
             keyProperty="id"
             keyColumn="id" useGeneratedKeys="true">
@@ -445,9 +452,19 @@
         select *
         from jcl_org_custom_template
         where ISUSED = 1
+          and overall = 0
           and creator = #{userId}
     </select>
 
+    <select id="getOverallCustomTemplate"
+            resultType="com.engine.organization.entity.hrmresource.po.SearchTemplatePO">
+        select *
+        from jcl_org_custom_template
+        where overall = 1
+    </select>
+
+
+
     <select id="selectByDepartmentId" resultType="com.engine.organization.entity.hrmresource.po.ResourceChartPO">
         select id,workcode,lastname,sex,departmentid,subcompanyid1,jobtitle,status,mobile
         from hrmresource where departmentid = #{departmentId} and status &lt; 4 order by id
diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
index 2f71bb38..747da547 100644
--- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
+++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.java
@@ -34,8 +34,10 @@ public interface JclOrgCustomTemplateMapper {
 
     int deleteByIds(@Param("ids") Collection<Long> ids);
 
-    int updateUsed(@Param("isused")String isused,@Param("id") String id,@Param("creator") String creator);
+    int updateUsed(@Param("overall")Integer overall,@Param("isused")String isused,@Param("id") String id,@Param("creator") String creator);
 
     JclOrgCustomTemplatePO queryIsusedTemp(@Param("isused")String isused,@Param("creator") String creator);
 
+    JclOrgCustomTemplatePO queryOverAll();
+
 }
diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
index 3043f7a8..0e37db0f 100644
--- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
+++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml
@@ -132,8 +132,11 @@
     <update id="updateUsed" parameterType="java.lang.String">
         update JCL_ORG_CUSTOM_TEMPLATE set isused = #{isused}
         <where>
+            <if test="overall !=null">
+                overall = #{overall}
+            </if>
             <if test="id !=null">
-                id = #{id}
+                and id = #{id}
             </if>
             <if test="creator !=null">
                 and creator = #{creator}
@@ -147,6 +150,14 @@
         from JCL_ORG_CUSTOM_TEMPLATE t where t.isused = #{isused} and t.creator = #{creator}
     </select>
 
+    <select id="queryOverAll" parameterType="java.lang.String" resultMap="BaseResultMap">
+        select
+        <include refid="Base_Column_List" />
+        from JCL_ORG_CUSTOM_TEMPLATE t where overall = 1
+    </select>
+
+
+
     <select id="listAllIdByCreator" resultType="java.lang.Long">
         select
         id
diff --git a/src/com/engine/organization/service/HrmResourceService.java b/src/com/engine/organization/service/HrmResourceService.java
index 7cba3ccf..6cc1178f 100644
--- a/src/com/engine/organization/service/HrmResourceService.java
+++ b/src/com/engine/organization/service/HrmResourceService.java
@@ -179,4 +179,12 @@ public interface HrmResourceService {
     Map<String, Object> chartResourceList(Integer departmentId,String versionId,String dimension,String statusValue);
 
 
+    /**
+     * @Description: 将当前模板应用到所有人
+     * @Author: liang.cheng
+     * @Date: 2024/7/23 3:02 PM
+     * @param: [params]
+     * @return: java.util.Map<java.lang.String,java.lang.Object>
+     */
+    Map<String, Object> customOverall(Map<String, Object> params);
 }
diff --git a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
index fbe393a8..31c5f4a9 100644
--- a/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
+++ b/src/com/engine/organization/service/impl/HrmResourceServiceImpl.java
@@ -149,6 +149,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         table.setSqlwhere(sqlWhere);
         List<WeaTableColumn> weaTableColumnList = new ArrayList<>();
         JclOrgCustomTemplatePO jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryIsusedTemp("1", String.valueOf(user.getUID()));
+
+        //2.是否存在通用模板
+        if (null == jclOrgCustomTemplatePO) {
+            jclOrgCustomTemplatePO = MapperProxyFactory.getProxy(JclOrgCustomTemplateMapper.class).queryOverAll();
+        }
+
         String columns = "";
         List<String> fields = new ArrayList<>();
         List<SearchConditionGroup> allConditions = getAllConditions();
@@ -317,16 +323,15 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         if ("custom".equals(type)) {
             templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID);
             returnMap.put("id", id);
-//            SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
-//            if (null != usedCustomTemplate) {
-//                returnMap.put("templateId", usedCustomTemplate.getId().toString());
-//            } else {
-//                returnMap.put("templateId", "-1");
-//            }
         } else {
             templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
         }
         templates.add(0, SearchTemplateParam.builder().key("-1").showname("默认模板").build());
+
+        //1.增加全局模板
+        if (userUID != 1) {
+            templates.addAll(getHrmResourceMapper().getCustomOverAll());
+        }
         returnMap.put("templates", templates);
         return returnMap;
     }
@@ -345,6 +350,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         templatePO.setIsused("0");
         templatePO.setCreateTime(new Date());
         templatePO.setUpdateTime(new Date());
+        templatePO.setOverall(0);
         getHrmResourceMapper().insertCustomTemplate(templatePO);
         return templatePO.getId();
     }
@@ -447,8 +453,8 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         SearchTemplatePO templatePO = buildSearchTemplateByFields(columns);
         JclOrgCustomTemplatePO jclOrgCustomTemplatePO = new JclOrgCustomTemplatePO();
         if (StringUtils.isNotBlank(templateId)) {
-            if (templateId.equals("-1")) {
-                getJclOrgCustomTemplateMapper().updateUsed("0", null, String.valueOf(user.getUID()));
+            if ("-1".equals(templateId)) {
+                getJclOrgCustomTemplateMapper().updateUsed(0,"0", null, String.valueOf(user.getUID()));
             } else {
                 jclOrgCustomTemplatePO = getJclOrgCustomTemplateMapper().selectByPrimaryKey(Long.parseLong(templateId));
                 if (jclOrgCustomTemplatePO != null) {
@@ -458,7 +464,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
                     jclOrgCustomTemplatePO.setWorkFields(templatePO.getWorkFields());
                     jclOrgCustomTemplatePO.setIsused(1);
                     //取消已启用模板
-                    getJclOrgCustomTemplateMapper().updateUsed("0", null, String.valueOf(user.getUID()));
+                    getJclOrgCustomTemplateMapper().updateUsed(0,"0", null, String.valueOf(user.getUID()));
                     //启用当前模板
                     getJclOrgCustomTemplateMapper().updateByPrimaryKeySelective(jclOrgCustomTemplatePO);
                 }
@@ -524,6 +530,19 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         return dataMap;
     }
 
+    @Override
+    public Map<String, Object> customOverall(Map<String, Object> params) {
+        RecordSet rs = new RecordSet();
+        Map<String, Object> data = new HashMap<>(2);
+        //1.将已有所有人的模板状态改变
+        rs.executeUpdate("update jcl_org_custom_template set overall = 0 where overall = 1");
+        //2.应用当前模板到所有人
+        String templateId = Util.null2String(params.get("templateId"));
+        boolean b = rs.executeUpdate("update jcl_org_custom_template set overall = 1,isused=1 where id = ?", templateId);
+        data.put("result",b);
+        return data;
+    }
+
     private List<ResourceListColumns> getTableColumns() {
         List<ResourceListColumns> list = new ArrayList<>();
         int language = user.getLanguage();
@@ -589,9 +608,34 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         btnDatas.put("topMenu", topMenuList);
         btnDatas.put("rightMenu", rightMenuList);
         btnDatas.put("hasRight", true);
+        btnDatas.put("loginId", user.getUID());
+        //获取当前用户使用的列定制模板Id
+        btnDatas.put("customTemplateId", getCustomTemplateId());
+
         return btnDatas;
     }
 
+    /**
+     * 获取当前用户使用的列定制模板Id
+     * @return
+     */
+    private String getCustomTemplateId() {
+
+        String customTemplateId = "-1";
+        SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
+        if (null != usedCustomTemplate) {
+            customTemplateId = usedCustomTemplate.getId().toString();
+        } else {
+            //查询全局模板
+            SearchTemplatePO overallCustomTemplate = getHrmResourceMapper().getOverallCustomTemplate();
+            if (null != overallCustomTemplate) {
+                customTemplateId = overallCustomTemplate.getId().toString();
+            }
+        }
+
+        return customTemplateId;
+    }
+
     @Override
     public Map<String, Object> getTabForm(Map<String, Object> params) {
         Map<String, Object> apiDatas = new HashMap<>();
diff --git a/src/com/engine/organization/web/HrmResourceController.java b/src/com/engine/organization/web/HrmResourceController.java
index 621e3c53..c5a45b49 100644
--- a/src/com/engine/organization/web/HrmResourceController.java
+++ b/src/com/engine/organization/web/HrmResourceController.java
@@ -374,4 +374,18 @@ public class HrmResourceController {
         }
     }
 
+    @POST
+    @Path("/customOverall")
+    @Produces(MediaType.APPLICATION_JSON)
+    public ReturnResult customOverall(@Context HttpServletRequest request, @Context HttpServletResponse response) {
+        try {
+            User user = HrmUserVarify.getUser(request, response);
+            Map<String,Object> map = ParamUtil.request2Map(request);
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).customOverall(map));
+        } catch (Exception e) {
+            return ReturnResult.exceptionHandle(e);
+        }
+    }
+
+
 }
diff --git a/src/com/engine/organization/wrapper/HrmResourceWrapper.java b/src/com/engine/organization/wrapper/HrmResourceWrapper.java
index 37f8200b..21145a46 100644
--- a/src/com/engine/organization/wrapper/HrmResourceWrapper.java
+++ b/src/com/engine/organization/wrapper/HrmResourceWrapper.java
@@ -114,4 +114,8 @@ public class HrmResourceWrapper extends OrganizationWrapper {
     public Integer saveColumnsCustomTemplate(Map<String,Object> params) {
         return getHrmResourceService(user).saveColumnsCustomTemplate(params);
     }
+
+    public Object customOverall(Map<String, Object> params) {
+        return getHrmResourceService(user).customOverall(params);
+    }
 }