Merge pull request '列定制BUG修复' (#148) from danikor into develop

Reviewed-on: #148

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

@@ -294,7 +294,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             templates = getHrmResourceMapper().getCustomTemplatesByUser(userUID);
             SearchTemplatePO usedCustomTemplate = getHrmResourceMapper().getUsedCustomTemplateByUser(user.getUID());
             if (null != usedCustomTemplate) {
-                returnMap.put("templateId", usedCustomTemplate.getId());
+                returnMap.put("templateId", usedCustomTemplate.getId().toString());
             } else {
                 returnMap.put("templateId", "-1");
             }