yanliming 1 год назад
Родитель
Сommit
4743fff948

+ 2 - 2
common/src/main/resources/mapper/base/VolunteerSignRecord.xml

@@ -76,8 +76,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="VolunteerSignRecordMap">
-		select 
-id_,name_,phone_,bak_,volunteer_tasks_id,create_by,create_time,update_by,update_time,del_flag		from base_volunteer_sign_record where id_=#{0}
+		select * from base_volunteer_sign_record where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_volunteer_sign_record where id_=#{0}
@@ -90,6 +89,7 @@ id_,name_,phone_,bak_,volunteer_tasks_id,create_by,create_time,update_by,update_
 			select * from base_volunteer_sign_record
 		]]>
 		<where>
+			del_flag=false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

+ 2 - 2
common/src/main/resources/mapper/base/VolunteerTasks.xml

@@ -81,8 +81,7 @@
 	where id_=#{id}
 	</update>
 	<select id="get" parameterType="string" resultMap="VolunteerTasksMap">
-		select 
-id_,introduce_,volunteer_requirements,school_contact,start_time,end_time,create_by,create_time,update_by,update_time,del_flag		from base_volunteer_tasks where id_=#{0}
+		select 	* from base_volunteer_tasks where id_=#{0}
 	</select>
 	<select id="exist" parameterType="string" resultType="int">
 		select count(*) from base_volunteer_tasks where id_=#{0}
@@ -95,6 +94,7 @@ id_,introduce_,volunteer_requirements,school_contact,start_time,end_time,create_
 			select * from base_volunteer_tasks
 		]]>
 		<where>
+			del_flag=false
 			<if test="searchParams.id != null">
 				and ID_ like #{searchParams.id}
 			</if>

+ 1 - 1
web/src/main/java/com/jpsoft/employment/modules/base/controller/VolunteerSignRecordController.java

@@ -210,7 +210,7 @@ public class VolunteerSignRecordController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
         if (StringUtils.isNotEmpty(id)) {
             searchParams.put("id","%" + id + "%");

+ 1 - 1
web/src/main/java/com/jpsoft/employment/modules/base/controller/VolunteerTasksController.java

@@ -209,7 +209,7 @@ public class VolunteerTasksController {
         Map<String,Object> searchParams = new HashMap<>();
 
         List<Sort> sortList = new ArrayList<>();
-        sortList.add(new Sort("id_","asc"));
+        sortList.add(new Sort("create_time","desc"));
 
         if (StringUtils.isNotEmpty(id)) {
             searchParams.put("id","%" + id + "%");