44323
2023-10-24 797b148b48d6fd1a584c0a2b639cd6f0fef81411
cloud-server-management/src/main/java/com/dsh/guns/modular/system/controller/code/TShopController.java
@@ -290,7 +290,14 @@
    @ResponseBody
    public Object list(String provinceCode, String cityCode , String name, String phone,String shopName) {
        Page<TStoreListVo> page = new PageFactory<TStoreListVo>().defaultPage();
        List<TStoreListVo> list =  storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
        String roleid = UserExt.getUser().getRoleid();
        List<TStoreListVo> list =new ArrayList<>();
        if("3".equals(roleid)){
            Integer objectId = UserExt.getUser().getObjectId();
            list = storeService.listAllStore(page,provinceCode,cityCode,name,phone,shopName,objectId);
        }else {
            list = storeService.listAll(page,provinceCode,cityCode,name,phone,shopName);
        }
        page.setRecords(list);
        return  super.packForBT(page);
    }
@@ -693,10 +700,8 @@
    @RequestMapping(value = "/deleteTwo")
    public Object delete2(Integer id) {
        try {
            TStoreOtherConfigTrue byId = tStoreOtherConfigTrueService.getById(id);
            storeOtherConfigService.removeById(id);
            byId.setState(2);
            tStoreOtherConfigTrueService.updateById(byId);
            return SUCCESS_TIP;
        }catch (Exception e){
            e.printStackTrace();