导出BUGFIX

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-api/src/main/resources/mapper/TzBaseEnterpriseInfoMapper.xml

@@ -154,7 +154,7 @@
 		<if test="sort != null">
 			${sort.field} ${sort.sortType},
 		</if>
-		rec_date desc
+		rec_date DESC,sequence_nbr DESC
 	</select>
 
 	<select id="queryBaseEnterpriseInIds" resultType="com.yeejoin.amos.boot.module.jczs.api.vo.BaseEnterpriseVo">

amos-boot-system-tzs/amos-boot-module-jczs/amos-boot-module-jczs-biz/src/main/java/com/yeejoin/amos/boot/module/jczs/biz/controller/TzBaseEnterpriseInfoController.java

@@ -184,7 +184,7 @@ public class TzBaseEnterpriseInfoController {
     }
 
 
-    @TycloudOperation(ApiLevel = UserType.AGENCY, needAuth = false)
+    @TycloudOperation(ApiLevel = UserType.AGENCY)
     @RequestMapping(value = "/page", method = RequestMethod.GET)
     @ApiOperation(httpMethod = "GET", value = "根据id查询", notes = "根据id查询")
     public ResponseModel<IPage<TzBaseEnterpriseInfoDto>> page(PageParam pageParam,

amos-boot-system-tzs/amos-boot-module-jg/amos-boot-module-jg-biz/src/main/java/com/yeejoin/amos/boot/module/jg/biz/feign/JczsServiceFeignClient.java

@@ -18,7 +18,7 @@ public interface JczsServiceFeignClient {
      * 企业信息列表分页查询
      */
     @RequestMapping(value = "/baseEnterprise/page", method = RequestMethod.GET)
-    ResponseModel<Page<Map<String, String>>> page(@RequestParam("page") int page,
+    ResponseModel<Page<Map<String, String>>> page(@RequestParam("current") int current,
                                                   @RequestParam("size") int size,
                                                   @RequestParam("keyword") String keyword,
                                                   @RequestParam Map<String, String> map);

amos-boot-system-tzs/amos-boot-module-ymt/amos-boot-module-ymt-api/src/main/resources/mapper/TzsUserInfoMapper.xml

@@ -117,7 +117,7 @@
         LEFT JOIN "amos_tzs_biz"."tzs_user_permission" up ON ur."sequence_nbr" = up."user_seq"
         <where>
             <if test='ids != null'>
-                and ur.sequence_nbr in
+                and (COALESCE (up.sequence_nbr, ur.sequence_nbr)) in
                 <foreach collection="ids" item="id" open="(" close=")" separator=",">
                     #{id}
                 </foreach>