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

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

@@ -76,7 +76,7 @@ public class FunctionOutStaffServiceImpl {
     private Integer frozenStaffNums(StaffOutParam param) {
         StaffPO staffPO = select(param);
         List<Integer> numberF = Arrays.asList(staffPO.getFreezeNum(),param.getNum());
-        //1.增加冻结数
+        //1.增加冻结数 （num为负数时为减少冻结数）
         Integer sum = numberF.stream()
                 .mapToInt(Integer::intValue)
                 .sum();

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

@@ -307,17 +307,22 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
     public Map<String, Object> getSearchTemplate(Map<String, Object> params) {
         Map<String, Object> returnMap = new HashMap<>();
         String type = Util.null2String(params.get("type"));
+        String id = Util.null2String(params.get("id"));
+        if ("".equals(id)) {
+            id = "-1";
+        }
         int userUID = user.getUID();
         // 根据ID查询所存储的模板
         List<SearchTemplateParam> templates;
         if ("custom".equals(type)) {
             templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID);
-            SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
+            returnMap.put("id", id);
-            if (null != usedCustomTemplate) {
+//            SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
-                returnMap.put("templateId", usedCustomTemplate.getId().toString());
+//            if (null != usedCustomTemplate) {
-            } else {
+//                returnMap.put("templateId", usedCustomTemplate.getId().toString());
-                returnMap.put("templateId", "-1");
+//            } else {
-            }
+//                returnMap.put("templateId", "-1");
+//            }
         } else {
             templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
         }