代码提交 bug解决

无关风月

2024-08-28 1c4311135628b53daa336821ff452292a9d063e9

 ruoyi-modules/ruoyi-management/src/main/java/com/ruoyi/management/service/impl/SlStoreManagementServiceImpl.java

@@ -53,13 +53,13 @@
        Page<SlStoreManagement> page = new Page<>(storeManagementQuery.getPageCurr(), storeManagementQuery.getPageSize());
        LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
        if (storeManagementQuery.getStoreManagementName()!=null&&storeManagementQuery.getStoreManagementName()!=""){
            wrapper.eq(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
            wrapper.like(SlStoreManagement::getStoreManagementName,storeManagementQuery.getStoreManagementName());
        }
        if(storeManagementQuery.getStoreManagementNo()!=null&&storeManagementQuery.getStoreManagementNo()!=""){
            wrapper.eq(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
        if(storeManagementQuery.getStoreManagementNo()!=null&&storeManagementQuery.getStoreManagementNo()!="" ){
            wrapper.like(SlStoreManagement::getStoreManagementNo,storeManagementQuery.getStoreManagementNo());
        }

        if ( storeManagementQuery.getStoreManagementGrade()!=null &&!storeManagementQuery.getStoreManagementGrade().equals("0") ){
            if ( storeManagementQuery.getStoreManagementGrade()!=null &&!storeManagementQuery.getStoreManagementGrade().equals("0") ){
            String[] split = storeManagementQuery.getStoreManagementGrade().split(",");
            List<Integer> arr=new ArrayList<>();
            for(int i=0;i<split.length;i++){
@@ -176,18 +176,6 @@
    @Override
    public List<SlStoreManagement> QueryStoreManagementList(QStoreManagementQuery StoreManagementQuery) {
        LambdaQueryWrapper< SlStoreManagement> wrapper= Wrappers.lambdaQuery();
        if (StoreManagementQuery.getCityCode()!=null && StoreManagementQuery.getCityCode()!=""){
                wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode());
        }
        if (StoreManagementQuery.getCountyCode()!=null && StoreManagementQuery.getCountyCode()!=""){
        wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode());
        }
        if (StoreManagementQuery.getTownCode()!=null && StoreManagementQuery.getTownCode()!=""){
        wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode());
        }
        if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){
            wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
        }
        wrapper.eq(SlStoreManagement::getDelFlag,0);
        wrapper.orderByDesc(SlStoreManagement::getCreateTime);
        Long userid = tokenService.getLoginUser().getUserid();
@@ -197,19 +185,72 @@
                // 仓库管理员 根据仓库管理员的等级查询对应的仓库
                switch (data.getRoleType()){
                    case 3:
                        wrapper.ge(SlStoreManagement::getStoreManagementGrade,3);
                        if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){
                            wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
                        }else{
                            wrapper.eq(SlStoreManagement::getStoreManagementGrade,3);

                        }
                        if (StoreManagementQuery.getCityCode()!=null && StoreManagementQuery.getCityCode()!=""){
                            wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode());
                        }else if (StoreManagementQuery.getCountyCode()!=null){
                            wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode());
                            wrapper.isNull(SlStoreManagement::getTownCode);
                        }else if (StoreManagementQuery.getTownCode()!=null){
                            wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode());
                        }else{
                            wrapper.eq(SlStoreManagement::getCityCode,data.getCityCode());
                            wrapper.isNull(SlStoreManagement::getCountyCode);
                        }
                        break;
                    case 4:
                        wrapper.ge(SlStoreManagement::getStoreManagementGrade,4);
                        if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){
                            wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
                        }else{
                            wrapper.eq(SlStoreManagement::getStoreManagementGrade,4);
                        }
                        if (StoreManagementQuery.getCountyCode()!=null && StoreManagementQuery.getCountyCode()!=""){
                            wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode());
                        }else{
                            wrapper.eq(SlStoreManagement::getCountyCode,data.getCountyCode());
                            wrapper.isNull(SlStoreManagement::getTownCode);
                        }
                        break;
                    case 5:
                        wrapper.ge(SlStoreManagement::getStoreManagementGrade,5);
                        if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){
                            wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
                        }else{
                            wrapper.eq(SlStoreManagement::getStoreManagementGrade,5);
                        }
                        if (StoreManagementQuery.getTownCode()!=null && StoreManagementQuery.getTownCode()!=""){
                            wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode());
                        }else{
                            wrapper.eq(SlStoreManagement::getTownCode,data.getTownCode());

                        }
                        break;
                    case 6:
                        wrapper.eq(SlStoreManagement::getStoreManagementGrade,6);
                        if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){
                            wrapper.ge(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
                        }else{
                            wrapper.eq(SlStoreManagement::getStoreManagementGrade,6);
                        }
                        break;
                }

            }else {
                if (StoreManagementQuery.getStoreManagementGrade()!=null&&StoreManagementQuery.getStoreManagementGrade()!=0){
                    wrapper.eq(SlStoreManagement::getStoreManagementGrade,StoreManagementQuery.getStoreManagementGrade());
                }
                if (StoreManagementQuery.getCityCode()!=null && StoreManagementQuery.getCityCode()!=""){
                    wrapper.eq(SlStoreManagement::getCityCode,StoreManagementQuery.getCityCode());
                }
                if (StoreManagementQuery.getCountyCode()!=null && StoreManagementQuery.getCountyCode()!=""){
                    wrapper.eq(SlStoreManagement::getCountyCode,StoreManagementQuery.getCountyCode());
                }
                if (StoreManagementQuery.getTownCode()!=null && StoreManagementQuery.getTownCode()!=""){
                    wrapper.eq(SlStoreManagement::getTownCode,StoreManagementQuery.getTownCode());
                }
            }

        }
@@ -232,15 +273,23 @@
            switch (data.getRoleType()){
                case 3:
                    wrapper.ge(SlStoreManagement::getStoreManagementGrade,3);
                    wrapper.eq(SlStoreManagement::getCityCode,data.getCityCode());


                    break;
                case 4:
                    wrapper.eq(SlStoreManagement::getCountyCode,data.getCountyCode());

                    wrapper.ge(SlStoreManagement::getStoreManagementGrade,4);
                    break;
                case 5:
                    wrapper.eq(SlStoreManagement::getTownCode,data.getTownCode());

                    wrapper.ge(SlStoreManagement::getStoreManagementGrade,5);
                    break;
                case 6:
                    wrapper.eq(SlStoreManagement::getStoreManagementGrade,6);
                    wrapper.eq(SlStoreManagement::getTownCode,data.getTownCode());
                    break;
            }
        }