Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into develop

src/com/engine/organization/mapper/hrmresource/SystemDataMapper.xml

@@ -133,6 +133,7 @@
               FROM cus_formfield t1,
                    cus_formdict t2
               WHERE t1.fieldid = t2.id
+                AND t1.isuse = 1
                 AND t1.scope = 'HrmCustomFieldByInfoType'
                 AND t1.scopeid = #{scopeId}
               UNION ALL

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">

src/com/engine/organization/service/HrmResourceService.java

@@ -133,7 +133,7 @@ public interface HrmResourceService {
      * @param params
      * @return
      */
-    Integer saveCustomTemplate(SearchTemplateParam params);
+    Map<String, Object> saveCustomTemplate(SearchTemplateParam params);
 
     /**
      * 批量修改保存定制列模板

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

@@ -344,24 +344,20 @@ 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;
     }
 
     @Override
-    public Integer saveCustomTemplate(SearchTemplateParam params) {
+    public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
         // 重复名称校验
+        Map<String, Object> data = new HashMap<>();
         SearchTemplatePO searchTemplateByName = getHrmResourceMapper().getCustomTemplateByName(user.getUID(), params.getShowname());
         OrganizationAssert.isFalse("默认模板".equals(params.getShowname()) || null != searchTemplateByName, SystemEnv.getHtmlLabelName(547439, user.getLanguage()));
         SearchTemplatePO templatePO = buildSearchTemplateByFields(params.getFields());
-        if (null == templatePO) {
+        OrganizationAssert.notNull(templatePO,"模板存储失败");
-            return -1;
+
-        }
         templatePO.setName(params.getShowname());
         templatePO.setCreator(user.getUID());
         templatePO.setIsused("0");
@@ -369,7 +365,12 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         templatePO.setUpdateTime(new Date());
         templatePO.setOverall(0);
         getHrmResourceMapper().insertCustomTemplate(templatePO);
-        return templatePO.getId();
+
+        Map<String, Object> param = new HashMap<>();
+        param.put("type","custom");
+        param.put("id",templatePO.getId());
+        data.put("result",getSearchTemplate(param));
+        return data;
     }
 
     @Override
@@ -720,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"));
 

src/com/engine/organization/web/HrmResourceController.java

@@ -286,8 +286,7 @@ public class HrmResourceController {
     public ReturnResult saveCustomTemplate(@Context HttpServletRequest request, @Context HttpServletResponse response, @RequestBody SearchTemplateParam params) {
         try {
             User user = HrmUserVarify.getUser(request, response);
-            Integer templateId = getHrmResourceWrapper(user).saveCustomTemplate(params);
+            return ReturnResult.successed(user,getHrmResourceWrapper(user).saveCustomTemplate(params));
-            return ReturnResult.successed(user,Util.null2String(templateId));
         } catch (Exception e) {
             return ReturnResult.exceptionHandle(e);
         }

src/com/engine/organization/wrapper/HrmResourceWrapper.java

@@ -91,7 +91,7 @@ public class HrmResourceWrapper extends OrganizationWrapper {
         return getHrmResourceService(user).getSearchTemplate(params);
     }
 
-    public Integer saveCustomTemplate(SearchTemplateParam params) {
+    public Map<String, Object> saveCustomTemplate(SearchTemplateParam params) {
         return getHrmResourceService(user).saveCustomTemplate(params);
     }