Merge remote-tracking branch 'origin/master' into 20240109-yw

# Conflicts:
#	src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

src/main/java/com/glxp/api/controller/basic/BasicCorpController.java

@@ -2,6 +2,7 @@ package com.glxp.api.controller.basic;
 
 import cn.hutool.core.collection.CollUtil;
 import cn.hutool.core.util.IdUtil;
+import cn.hutool.core.util.StrUtil;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.github.pagehelper.PageInfo;
 import com.glxp.api.annotation.AuthRuleAnnotation;
@@ -22,6 +23,7 @@ import com.glxp.api.service.basic.BasicCorpService;
 import com.glxp.api.service.sup.UserCompanyService;
 import com.glxp.api.util.CustomUtil;
 import com.glxp.api.util.StringUtils;
+import com.glxp.api.util.StreamUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.validation.BindingResult;
 import org.springframework.web.bind.annotation.GetMapping;

src/main/java/com/glxp/api/service/basic/impl/BasicCorpServiceImpl.java

@@ -121,8 +121,8 @@ public class BasicCorpServiceImpl extends ServiceImpl<BasicCorpDao, BasicCorpEnt
 
     @Override
     public NmapTotalResponse statCompanyCorpCount(String companyId) {
-        Long supCount = basicCorpDao.selectCount(new QueryWrapper<BasicCorpEntity>().eq("corpType", 1).eq("companyIdFk", companyId));
-        Long customCount = basicCorpDao.selectCount(new QueryWrapper<BasicCorpEntity>().eq("corpType", 2).eq("companyIdFk", companyId));
+        Long supCount = basicCorpDao.selectCount(new QueryWrapper<BasicCorpEntity>().eq("corpType", 2).eq("companyIdFk", companyId));
+        Long customCount = basicCorpDao.selectCount(new QueryWrapper<BasicCorpEntity>().eq("corpType", 1).eq("companyIdFk", companyId));
         NmapTotalResponse nmapTotalResponse = new NmapTotalResponse();
         nmapTotalResponse.setSupCount(supCount.intValue());
         nmapTotalResponse.setCustomCount(customCount.intValue());