Merge pull request '显示定制列穿梭框接口开发' (#138) from feature/dxf into develop

Reviewed-on: http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization/pulls/138

src/com/engine/organization/entity/hrmresource/param/SearchTemplateParam.java

@@ -16,7 +16,7 @@ import lombok.NoArgsConstructor;
 @NoArgsConstructor
 public class SearchTemplateParam {
     private String key;
-    private boolean selected;
+    //private boolean selected;
     private String showname;
     private String fields;
 }

src/com/engine/organization/mapper/resource/HrmResourceMapper.xml

@@ -12,7 +12,7 @@
     <resultMap id="SearchTemplateMap" type="com.engine.organization.entity.hrmresource.param.SearchTemplateParam">
         <result column="id" property="key"/>
         <result column="name" property="showname"/>
-        <result column="selected" property="selected"/>
+<!--        <result column="selected" property="selected"/>-->
     </resultMap>
 
 
@@ -117,8 +117,7 @@
     </select>
     <select id="getSearchTemplatesByUser" resultMap="SearchTemplateMap">
         select id,
-               name,
+               name
-               'false' as selected
         from jcl_org_search_template
         where creator = #{userId}
     </select>
@@ -138,8 +137,7 @@
     <select id="getCustomTemplatesByUser"
             resultMap="SearchTemplateMap">
         select id,
-               name,
+               name
-               'false' as selected
         from jcl_org_custom_template
         where creator = #{userId}
     </select>

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

@@ -235,7 +235,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         } else {
             templates = getHrmResourceMapper().getSearchTemplatesByUser(userUID);
         }
-        templates.add(0, SearchTemplateParam.builder().key("-1").selected(false).showname("默认模板").build());
+        templates.add(0, SearchTemplateParam.builder().key("-1").showname("默认模板").build());
         return templates;
     }