Merge remote-tracking branch 'origin/master'

common/src/main/resources/mapper/job/UserCollection.xml

@@ -153,7 +153,7 @@
 			left join sys_data_dictionary waged on j.wage_type=waged.id_ and waged.del_flag=0
 			left join base_company p on j.company_id=p.id_ and p.del_flag=0
 			left join sys_data_dictionary  pd on p.scale_=pd.id_ and pd.del_flag=0
-			left join base_city  as bcity on bcity.id_=j.area_
+			left join base_city  as bcity on bcity.id_=j.area_ and b.del_flag=0
 		]]>
 		<where>
 			and job_user_id = #{searchParams.jobUserId}

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

@@ -48,7 +48,8 @@ public class UserBrowseApiController {
     public MessageResult<Map> pagedLoad( @RequestParam(value="pageIndex",defaultValue="1") int pageIndex,
                                          @RequestParam(value="pageSize",defaultValue="20") int pageSize,
                                          @RequestParam(value="type",defaultValue="0") int type,
-                                         @RequestAttribute String subject){
+                                         @RequestAttribute String subject,
+                                         String token){
         try{
             List<Sort> sortList = new ArrayList<>();