Merge remote-tracking branch 'origin/master'

src/main/resources/mapping/LeaderworkCQuery.xml

@@ -25,7 +25,7 @@
         <if test="position != null and position != ''">
             and ldt.position like concat('%',#{position},'%')
         </if>
-        <if test="sex != null">
+        <if test="sex != null and sex != ''">
             and ldt.sex = #{sex}
         </if>
         <if test="party != null and party != ''">

src/main/resources/static/app/main/leaderwork/leaderteam/list.html

@@ -41,7 +41,7 @@
                                     <div class="col-lg-2 col-md-2">
                                         <div class="form-group">
                                             <div class="form-line">
-                                                <select class="form-control show-tick" ng-model="dataModel.sex"
+                                                <select class="form-control show-tick" ng-model="selectparams.sex"
                                                         ng-options="type.dickey as type.dicvalue for type in sexList"
                                                         class="form-control"
                                                         name="sex" ng-change="search()">
@@ -74,14 +74,16 @@
                                                 <input name="joinStartDate" class="form-control fm-ct-first"
                                                        autocomplete="off"
                                                        autoclose="true"
-                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       data-date-format="yyyyMM" data-date-type="date"
+                                                       data-min-view="1" data-start-view="1"
                                                        ng-model="selectparams.joinStartDate"
                                                        ng-change="search()"
                                                        placeholder="" bs-datepicker/>
                                                 <input name="joinEndDate" class="form-control fm-ct-last"
                                                        autocomplete="off"
                                                        autoclose="true"
-                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       data-date-format="yyyyMM" data-date-type="date"
+                                                       data-min-view="1" data-start-view="1"
                                                        ng-model="selectparams.joinEndDate"
                                                        ng-change="search()"
                                                        placeholder="" bs-datepicker/>
@@ -97,14 +99,16 @@
                                                 <input name="birthStartDate" class="form-control fm-ct-first"
                                                        autocomplete="off"
                                                        autoclose="true"
-                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       data-date-format="yyyyMM" data-date-type="date"
+                                                       data-min-view="1" data-start-view="1"
                                                        ng-model="selectparams.birthStartDate"
                                                        ng-change="search()"
                                                        placeholder="" bs-datepicker/>
                                                 <input name="birthEndDate" class="form-control fm-ct-last"
                                                        autocomplete="off"
                                                        autoclose="true"
-                                                       data-date-format="yyyy-MM-dd" data-date-type="string"
+                                                       data-date-format="yyyyMM" data-date-type="date"
+                                                       data-min-view="1" data-start-view="1"
                                                        ng-model="selectparams.birthEndDate"
                                                        ng-change="search()"
                                                        placeholder="" bs-datepicker/>

src/main/resources/static/app/main/leaderwork/leaderteam/list.js

@@ -23,7 +23,7 @@
             joinEndDate: null,
             position: '',
             party: '',
-            sex: null,
+            sex: '',
             birthStartDate: null,
             birthEndDate: null
         };