Merge remote-tracking branch 'origin/dev' into dev

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractLogisticsService.java

@@ -735,6 +735,7 @@ public class KwcContractLogisticsService {
     public void export(QueryListReqVo reqVo, HttpServletResponse response) {
         QueryListReqDto queryListReqDto = new QueryListReqDto();
         BeanUtils.copyProperties(reqVo, queryListReqDto);
+        queryListReqDto.setIdList(StringUtils.splitStrToList(reqVo.getIds(), Global.COMMA, Long.class));
         List<Long> allEnt = new ArrayList<>();
         if (Objects.isNull(reqVo.getEntId())) {
             queryListReqDto.setEntId(LoginUserHolder.getEntId());
@@ -941,6 +942,7 @@ public class KwcContractLogisticsService {
      * @date: 2023/9/13
      */
     public void exportLogisticsList(QueryListReqVo reqVo, HttpServletResponse response) {
+        reqVo.setIdList(StringUtils.splitStrToList(reqVo.getIds(), Global.COMMA, Long.class));
         List<QueryListResDto> queryListResDtos = kwcContractLogisticsMapper.queryLogisticsList(reqVo);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
             throw new SystemException("导出数据为空");

sckw-modules/sckw-contract/src/main/java/com/sckw/contract/service/KwcContractTradeService.java

@@ -738,6 +738,7 @@ public class KwcContractTradeService {
     public void export(QueryListReqVo reqVo, HttpServletResponse response) {
         QueryListReqDto queryListReqDto = new QueryListReqDto();
         BeanUtils.copyProperties(reqVo, queryListReqDto);
+        queryListReqDto.setIdList(StringUtils.splitStrToList(reqVo.getIds(), Global.COMMA, Long.class));
         List<Long> allEnt = new ArrayList<>();
         if (Objects.isNull(reqVo.getEntId())) {
             queryListReqDto.setEntId(LoginUserHolder.getEntId());
@@ -942,6 +943,7 @@ public class KwcContractTradeService {
      * @date: 2023/9/13
      */
     public void exportTradeList(QueryListReqVo reqVo, HttpServletResponse response) {
+        reqVo.setIdList(StringUtils.splitStrToList(reqVo.getIds(), Global.COMMA, Long.class));
         List<QueryListResDto> queryListResDtos = kwcContractTradeMapper.queryTradeList(reqVo);
         if (CollectionUtils.isEmpty(queryListResDtos)) {
             throw new SystemException("导出数据为空");

sckw-modules/sckw-system/src/main/java/com/sckw/system/controller/KwsUserController.java

@@ -9,7 +9,6 @@ import com.sckw.core.model.page.PageHelperUtil;
 import com.sckw.core.model.page.PageResult;
 import com.sckw.core.utils.StringUtils;
 import com.sckw.core.web.constant.HttpStatus;
-import com.sckw.core.web.context.LoginUserHolder;
 import com.sckw.core.web.response.HttpResult;
 import com.sckw.redis.constant.RedisConstant;
 import com.sckw.redis.utils.RedissonUtils;

sckw-modules/sckw-system/src/main/java/com/sckw/system/model/vo/req/EntFindPageReqVo.java

@@ -98,7 +98,7 @@ public class EntFindPageReqVo extends PageRequest implements Serializable {
     /**
      * 企业id
      */
-    private List<Long> idList;
+    private List<Long> ids;
 
     /**
      * 查企业客户

sckw-modules/sckw-system/src/main/java/com/sckw/system/service/KwsEnterpriseService.java

@@ -270,7 +270,7 @@ public class KwsEnterpriseService {
     public List<FindEntListPojo> findPojo(EntFindPageReqVo reqVo) {
         FindPojoParam findPojoParam = new FindPojoParam();
         BeanUtils.copyProperties(reqVo, findPojoParam);
-
+        findPojoParam.setIdList(reqVo.getIds());
         if (StringUtils.isNotBlank(reqVo.getEntTypes())) {
             findPojoParam.setTypeList(Arrays.stream(reqVo.getEntTypes().split(Global.COMMA)).map(Integer::parseInt).toList());
         }

sckw-modules/sckw-system/src/main/resources/mapper/KwsEnterpriseDao.xml

@@ -174,7 +174,7 @@
     group by a.id
     ) tab
      where tab.id is not null
-    order by tab.create_time desc
+    order by tab.update_time desc
   </select>
 
   <select id="findList" resultType="com.sckw.system.model.vo.res.FindEntListResVo" parameterType="com.sckw.system.model.vo.req.FindListReqVo">

sckw-modules/sckw-system/src/main/resources/mapper/KwsRoleDao.xml

@@ -161,8 +161,8 @@
     <if test="endTime != null and endTime != ''" >
       and sr.create_time &lt; date_add(#{endTime}, INTERVAL 1 DAY)
     </if>
-    <if test="idList != null and idList.size() > 0">
-      <foreach collection="idList" item="item" open="(" close=")" separator=",">
+    <if test="ids != null and ids.size() > 0">
+      <foreach collection="ids" item="item" open="(" close=")" separator=",">
         #{item}
       </foreach>
     </if>

sckw-modules/sckw-system/src/main/resources/mapper/KwsUserDao.xml

@@ -240,9 +240,9 @@
     <if test="systemType != null and systemType != ''">
       and su.system_type = #{systemType, jdbcType=VARCHAR}
     </if>
-    <if test="idList != null and idList.size() > 0">
+    <if test="ids != null and ids.size() > 0">
       and su.id in
-      <foreach collection="idList" item="item" open="(" close=")" separator=",">
+      <foreach collection="ids" item="item" open="(" close=")" separator=",">
         #{item}
       </foreach>
     </if>