修复bug

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/controller/UmsCompanyController.java

@@ -23,6 +23,7 @@ import javax.servlet.http.HttpServletRequest;
 import java.security.Principal;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Map;
 
 @Controller
 @Api(tags = "UmsCompanyController", description = "供应商信息")
@@ -75,8 +76,8 @@ public class UmsCompanyController {
     public CommonResult list(@RequestParam(value = "pageSize")int pageSize,
                              @RequestParam(value = "pageNo")int pageNo){
 
-        List<UmsCompanyDto> infoList = umsCompanyService.getCompanyInfoList(pageSize, pageNo);
-        return CommonResult.success(CommonPage.restPage(infoList));
+        Map<String,Object> obj= umsCompanyService.getCompanyInfoList(pageSize, pageNo);
+        return CommonResult.success(obj);
     }
 
     @ApiOperation(value = "获取供应商详细信息")

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/UmsCompanyService.java

@@ -6,8 +6,10 @@ import com.hwrj.cloud.admin.model.UmsAdmin;
 import com.hwrj.cloud.admin.model.UmsCompanyFile;
 import com.hwrj.cloud.admin.model.UmsCompanyInfo;
 import com.hwrj.cloud.admin.model.UmsCompanyShop;
+import com.hwrj.cloud.common.api.CommonPage;
 
 import java.util.List;
+import java.util.Map;
 
 public interface UmsCompanyService {
 
@@ -42,7 +44,7 @@ public interface UmsCompanyService {
      * excel导入供应商
      *
      */
-    public List<UmsCompanyDto> getCompanyInfoList(int pageSize, int pageNo);
+    public Map<String,Object> getCompanyInfoList(int pageSize, int pageNo);
 
 
     /**

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/PmsProductServiceImpl.java

@@ -253,7 +253,7 @@ public class PmsProductServiceImpl implements PmsProductService {
     @Override
     public List<PmsProduct> list(PmsProductQueryParam productQueryParam, Integer pageSize, Integer pageNum) {
 
-        long compId = CurrUserUtil.getCompId();
+        Long compId = CurrUserUtil.getCompIdInfo();
         PageHelper.startPage(pageNum, pageSize);
         PmsProductExample productExample = new PmsProductExample();
         PmsProductExample.Criteria criteria = productExample.createCriteria();

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/service/impl/UmsCompanyInfoServiceImpl.java

@@ -3,6 +3,7 @@ package com.hwrj.cloud.admin.service.impl;
 import cn.hutool.core.bean.BeanUtil;
 import com.alibaba.excel.util.StringUtils;
 import com.github.pagehelper.PageHelper;
+import com.github.pagehelper.PageInfo;
 import com.hwrj.cloud.admin.dao.UmsCompanyShopDao;
 import com.hwrj.cloud.admin.dto.UmsCompanyDto;
 import com.hwrj.cloud.admin.excelEntity.UmsCompanyInfoExcel;
@@ -11,15 +12,15 @@ import com.hwrj.cloud.admin.mapper.UmsCompanyInfoMapper;
 import com.hwrj.cloud.admin.mapper.UmsCompanyShopMapper;
 import com.hwrj.cloud.admin.model.*;
 import com.hwrj.cloud.admin.service.UmsCompanyService;
+import com.hwrj.cloud.common.api.CommonPage;
 import com.hwrj.cloud.common.exception.GlobalException;
 
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
+
+import java.util.*;
 
 @Service
 @Slf4j
@@ -42,6 +43,7 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
     public void add(UmsCompanyDto dto) {
         UmsCompanyInfo ums = new UmsCompanyInfo();
         BeanUtil.copyProperties(dto,ums);
+        ums.setCreateTime(new Date());
         int i = umsCompanyInfoMapper.insertSelective(ums);
         List<UmsCompanyFile> files = dto.getFiles();
         List<UmsCompanyShop> shops = dto.getShops();
@@ -123,23 +125,28 @@ public class UmsCompanyInfoServiceImpl implements UmsCompanyService {
     }
 
     @Override
-    public List<UmsCompanyDto> getCompanyInfoList(int pageSize, int pageNo) {
+    public Map<String,Object> getCompanyInfoList(int pageSize, int pageNo) {
+        Map<String,Object> hasp=new HashMap<>();
         PageHelper.startPage(pageNo,pageSize);
         UmsCompanyInfoExample example = new UmsCompanyInfoExample();
         UmsCompanyInfoExample.Criteria criteria = example.createCriteria();
         criteria.andCompStatusEqualTo(0);
+        example.setOrderByClause("create_time desc");
         List<UmsCompanyInfo> companyInfos = umsCompanyInfoMapper.selectByExample(example);
+        CommonPage<UmsCompanyInfo> umsCompanyInfoCommonPage = CommonPage.restPage(companyInfos);
+        List<UmsCompanyInfo> list = umsCompanyInfoCommonPage.getList();
         List<UmsCompanyDto> dtos = new ArrayList<>();
-        companyInfos.stream().forEach(comp->{
+        list.stream().forEach(comp->{
             UmsCompanyDto dto= new UmsCompanyDto();
             BeanUtil.copyProperties(comp,dto);
             dto.setFiles(getCompanyFile(comp.getId()));
             dto.setShops(getCompanyShop(comp.getId()));
             dtos.add(dto);
             dtos.add(dto);
-
         });
-        return dtos;
+        hasp.put("total",umsCompanyInfoCommonPage.getTotal());
+        hasp.put("list",dtos);
+        return hasp;
     }
 
     @Override

forest-admin/admin-server/src/main/java/com/hwrj/cloud/admin/util/CurrUserUtil.java

@@ -23,7 +23,7 @@ public class CurrUserUtil {
         return SecurityContextHolder.getContext().getAuthentication();
     }
 
-    public static UmsAdmin getUmsAdmin(){
+    public static UmsAdmin getUmsAdmin() {
         Authentication authentication = getAuthentication();
         if (authentication == null) {
             return null;
@@ -31,7 +31,7 @@ public class CurrUserUtil {
         AdminUserDetails adminUserDetails = getLoginUser(authentication);
         UmsAdmin umsAdmin = adminUserDetails.getUmsAdmin();
         if (StringUtils.isEmpty(umsAdmin)) {
-            throw new GlobalException((int)ResultCode.UNAUTHORIZED.getCode(),ResultCode.UNAUTHORIZED.getMessage());
+            throw new GlobalException((int) ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMessage());
         }
         return umsAdmin;
     }
@@ -44,7 +44,7 @@ public class CurrUserUtil {
         if (principal instanceof AdminUserDetails) {
             return (AdminUserDetails) principal;
         }
-        throw new GlobalException((int)ResultCode.UNAUTHORIZED.getCode(),ResultCode.UNAUTHORIZED.getMessage());
+        throw new GlobalException((int) ResultCode.UNAUTHORIZED.getCode(), ResultCode.UNAUTHORIZED.getMessage());
     }
 
     /**
@@ -52,8 +52,8 @@ public class CurrUserUtil {
      */
     public static int getUserId() {
         UmsAdmin umsAdmin = getUmsAdmin();
-        if (StringUtils.isEmpty(umsAdmin.getId())){
-            throw new GlobalException(1,"请登录!");
+        if (StringUtils.isEmpty(umsAdmin.getId())) {
+            throw new GlobalException(1, "请登录!");
         }
         long userId = umsAdmin.getId();
         return (int) userId;
@@ -64,13 +64,25 @@ public class CurrUserUtil {
      */
     public static long getCompId() {
         UmsAdmin umsAdmin = getUmsAdmin();
-        if (StringUtils.isEmpty(umsAdmin.getCompId())){
-            throw new GlobalException(1,"用户未绑定供应商!");
+        if (StringUtils.isEmpty(umsAdmin.getCompId())) {
+            throw new GlobalException(1, "登录用户未绑定供应商!");
         }
         long compId = umsAdmin.getCompId();
         return compId;
     }
 
+    /**
+     * 获取用户绑定供应商id
+     */
+    public static Long getCompIdInfo() {
+        UmsAdmin umsAdmin = getUmsAdmin();
+        Long compId = umsAdmin.getCompId();
+        if(StringUtils.isEmpty(compId)){
+            return null;
+        }
+        return compId;
+    }
+
     /**
      * 获取用户绑定供应商名称
      */