bug修改

common/src/main/resources/mapper/base/LabourServices.xml

@@ -123,7 +123,7 @@
 			</if>
 			<if test="searchParams.typeB != null">
 				<![CDATA[
-                  and type_ = #{searchParams.typeB}
+                  and type_ = #{searchParams.typeB} and approval_status = '2'
                 ]]>
 			</if>
 		</where>

web/src/main/java/com/jpsoft/employment/modules/mobile/controller/LabourApiController.java

@@ -49,7 +49,7 @@ public class LabourApiController {
             @ApiImplicitParam(name = "typeB", value = "类型(1：我要用工,2：我有工人)", required = false, paramType = "query"),
     })
     public MessageResult<Map> getLabourList(
-            String approvalStatus,String approveTimeRange,String token,String typeB,
+            String approveTimeRange,String token,String typeB,
             @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
             @RequestParam(value="pageSize",defaultValue="20") int pageSize,
             @RequestAttribute String subject) {
@@ -70,10 +70,6 @@ public class LabourApiController {
             List<Sort> sortList = new ArrayList<>();
             sortList.add(new Sort("create_time","desc"));
 
-            if (StringUtils.isNotEmpty(approvalStatus)) {
-                searchParams.put("approvalStatus",approvalStatus);
-            }
-
             if (StringUtils.isNotEmpty(approveTimeRange)) {
                 String[] timeRangeArray = approveTimeRange.split(",");
                 String beginTime = "";