修改bug

src/main/java/com/glxp/api/controller/auth/AuthAdminController.java

@@ -174,7 +174,7 @@ public class AuthAdminController {
     public BaseResponse customerRolesList(@RequestParam(value = "page", defaultValue = "1") Integer page,
                                       @RequestParam(value = "limit", defaultValue = "100") Integer limit) {
 
-        List<AuthRole> authRoleList = authRoleService.listCustomerRoles(page, limit, 1);
+        List<AuthRole> authRoleList = authRoleService.getlistCustomerRoles(page, limit, 1);
 //        List<AuthRole> authRoleList = authRoleService.listAuthRoles2(page, limit);
         PageInfo<AuthRole> pageInfo = new PageInfo<>(authRoleList);
         PageSimpleResponse<AuthAdminRoleResponse> pageSimpleResponse = new PageSimpleResponse<>();

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

@@ -212,11 +212,13 @@ public class UdiRlSupController extends BaseController {
     @Log(title = "单据管理", businessType = BusinessType.INSERT)
     public BaseResponse insertFilter(@RequestBody UdiInfoExportRequest udiInfoExportRequest) {
         CompanyEntity companyEntity = companyService.findCompany(udiInfoExportRequest.getCustomerId() + "");
-        if (companyEntity.getUnitIdFk().equals("110")) {
+       if(companyEntity != null){
+        if("110".equals(companyEntity.getUnitIdFk())) {
             udiInfoExportRequest.setUnitFk(null);
         } else {
             udiInfoExportRequest.setUnitFk(companyEntity.getUnitIdFk());
         }
+       }
         //查询本企业有没有选择该产品有选择不能选择
         CompanyProductRelevanceRequest companyProductRelevanceRequest = new CompanyProductRelevanceRequest();
         companyProductRelevanceRequest.setCustomerId(udiInfoExportRequest.getCustomerId() + "");

src/main/java/com/glxp/api/controller/inv/InvPreinOrderController.java

@@ -8,6 +8,7 @@ import com.glxp.api.common.res.BaseResponse;
 import com.glxp.api.common.util.ResultVOUtils;
 import com.glxp.api.constant.BusinessType;
 import com.glxp.api.controller.BaseController;
+import com.glxp.api.entity.auth.AuthAdmin;
 import com.glxp.api.entity.basic.UdiEntity;
 import com.glxp.api.entity.inout.IoCodeTempEntity;
 import com.glxp.api.entity.inv.InvPreinDetailEntity;
@@ -18,6 +19,7 @@ import com.glxp.api.req.inv.FilterInvProductDetailRequest;
 import com.glxp.api.req.system.DeleteRequest;
 import com.glxp.api.res.inv.InvPreinDetailResponse;
 import com.glxp.api.res.inv.InvPreinOrderResponse;
+import com.glxp.api.service.auth.CustomerService;
 import com.glxp.api.service.inv.InvPreProductDetailService;
 import com.glxp.api.service.inv.InvPreinDetailService;
 import com.glxp.api.service.inv.InvPreinOrderService;
@@ -42,6 +44,8 @@ public class InvPreinOrderController extends BaseController {
     @Resource
     InvPreinDetailService invPreinDetailService;
 
+    @Resource
+    CustomerService customerService;
     @GetMapping("/udiwms/inv/prein/filter")
     public BaseResponse filterOrder(FilterInvPreinRequest filterInvPreinRequest) {
 
@@ -57,6 +61,8 @@ public class InvPreinOrderController extends BaseController {
 
     @GetMapping("/udiwms/inv/prein/detail")
     public BaseResponse filterDetail(FilterInvPreinDetailRequest filterInvPreinDetailRequest) {
+        AuthAdmin authAdmin = customerService.getUserBean();
+        filterInvPreinDetailRequest.setErpId(authAdmin.getCustomerId());
         List<InvPreinDetailResponse> list = invPreinDetailService.filterList(filterInvPreinDetailRequest);
         PageInfo<InvPreinDetailResponse> pageInfo = new PageInfo<>(list);
         return ResultVOUtils.page(pageInfo);

src/main/java/com/glxp/api/entity/inout/IoCodeLostEntity.java

@@ -7,6 +7,7 @@ import com.baomidou.mybatisplus.annotation.TableName;
 
 import java.util.Date;
 
+import com.glxp.api.util.page.ListPageRequest;
 import lombok.Data;
 
 /**
@@ -14,7 +15,7 @@ import lombok.Data;
  */
 @Data
 @TableName(value = "io_code_lost")
-public class IoCodeLostEntity {
+public class IoCodeLostEntity extends ListPageRequest {
     @TableId(value = "id", type = IdType.AUTO)
     private Integer id;
 

src/main/java/com/glxp/api/req/inv/FilterInvPreinDetailRequest.java

@@ -23,4 +23,5 @@ public class FilterInvPreinDetailRequest extends ListPageRequest {
     private String nameCode;
     private String ylqxzcrbarmc;
     private Integer status;
+    private String erpId;
 }

src/main/java/com/glxp/api/service/auth/AuthRoleService.java

@@ -21,6 +21,10 @@ public interface AuthRoleService {
 
     List<AuthRole> listCustomerRoles(Integer page, Integer limit, Integer isCustomer);
 
+    List<AuthRole> getlistCustomerRoles(Integer page, Integer limit, Integer isCustomer);
+
+
+
     List<AuthRole> listAuthRoles2(Integer page, Integer limit);
 
     boolean deleteById(Long id);

src/main/java/com/glxp/api/service/auth/impl/AuthRoleServiceImpl.java

@@ -103,6 +103,16 @@ public class AuthRoleServiceImpl implements AuthRoleService {
         return list;
     }
 
+    @Override
+    public List<AuthRole> getlistCustomerRoles(Integer page, Integer limit, Integer isCustomer) {
+        page = page != null && page > 0 ? page : 1;
+        limit = limit != null && limit > 0 && limit < 100 ? limit : 100;
+        int offset = (page - 1) * limit;
+        PageHelper.offsetPage(offset, limit);
+        List<AuthRole> list = authRoleDao.getCustomerRoles(isCustomer);
+        return list;
+    }
+
     @Override
     public List<AuthRole> listAuthRoles2(Integer page, Integer limit) {
         page = page != null && page > 0 ? page : 1;

src/main/java/com/glxp/api/service/inout/impl/IoCodeLostServiceImpl.java

@@ -2,6 +2,7 @@ package com.glxp.api.service.inout.impl;
 
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
+import com.github.pagehelper.PageHelper;
 import com.glxp.api.res.inout.IoCodeLostResponse;
 import org.springframework.stereotype.Service;
 
@@ -12,6 +13,7 @@ import com.glxp.api.entity.inout.IoCodeLostEntity;
 import com.glxp.api.service.inout.IoCodeLostService;
 import org.springframework.transaction.annotation.Transactional;
 
+import java.util.Collections;
 import java.util.List;
 
 @Service
@@ -24,6 +26,13 @@ public class IoCodeLostServiceImpl extends ServiceImpl<IoCodeLostMapper,IoCodeLo
 
     @Override
     public List<IoCodeLostResponse> selectLost(IoCodeLostEntity ioCodeLostEntity) {
+        if (ioCodeLostEntity == null) {
+            return Collections.emptyList();
+        }
+        if (ioCodeLostEntity.getPage() != null) {
+            int offset = (ioCodeLostEntity.getPage() - 1) * ioCodeLostEntity.getLimit();
+            PageHelper.offsetPage(offset, ioCodeLostEntity.getLimit());
+        }
         return codeLostEntityMapper.selectLost(ioCodeLostEntity);
     }
 

src/main/resources/mybatis/mapper/auth/AuthRoleDao.xml

@@ -48,7 +48,7 @@
             resultType="com.glxp.api.entity.auth.AuthRole">
         SELECT role_id, role_name
         FROM auth_role
-        where `isCustomer` = #{isCustomer}  and status =1
+        where `isCustomer` = #{isCustomer}  and status =0
     </select>
 
 

src/main/resources/mybatis/mapper/inv/InvPreinDetailDao.xml

@@ -53,6 +53,9 @@
             <if test="zczbhhzbapzbh != null and zczbhhzbapzbh != ''">
                 AND bp.zczbhhzbapzbh = #{zczbhhzbapzbh}
             </if>
+            <if test="erpId != null and erpId != ''">
+                AND bc.erpId = #{erpId}
+            </if>
             <if test="startAduditTime != null and startAduditTime != '' and endAduditTime != null and endAduditTime != ''">
                 AND date_format(inv_prein_order.auditTime, '%Y-%m-%d') between date_format(#{startAduditTime}, '%Y-%m-%d') and date_format(#{endAduditTime}, '%Y-%m-%d')
             </if>