From 16c34dd4aab509f301714b04e546e9c3e7da0367 Mon Sep 17 00:00:00 2001
From: nidapeng <jp@doumee.com>
Date: 星期二, 09 四月 2024 16:29:07 +0800
Subject: [PATCH] 提交一把
---
server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java | 2 +-
company/src/components/business/modification.vue | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/company/src/components/business/modification.vue b/company/src/components/business/modification.vue
index 7c2181f..53e9d17 100644
--- a/company/src/components/business/modification.vue
+++ b/company/src/components/business/modification.vue
@@ -73,7 +73,7 @@
import GlobalWindow from '@/components/common/GlobalWindow'
import { all, listForCompany } from '@/api/business/solutions'
-import { updateSolutions, pageAll as shopList } from '@/api/business/company'
+import {updateSolutions, pageAll as shopList, allForFp} from '@/api/business/company'
export default {
name: 'modification',
@@ -145,7 +145,7 @@
.then(res => {
this.programme = res
})
- shopList({ type: 1, status: 0 })
+ allForFp({ type: 1, status: 0 })
.then(res => {
console.log(res)
this.shops = res
diff --git a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
index aafffd6..af6dc52 100644
--- a/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
+++ b/server/service/src/main/java/com/doumee/service/business/impl/CompanyServiceImpl.java
@@ -783,7 +783,7 @@
company.setIsdeleted(Constants.ZERO);
LoginUserInfo user = (LoginUserInfo) SecurityUtils.getSubject().getPrincipal();
if(Constants.equalsInteger(company.getType(),Constants.ONE)){
- return new ArrayList<>();
+// return new ArrayList<>();
}else {
if(Constants.equalsInteger(user.getType(),Constants.TWO)){
//濡傛灉鏄晢鎴�
--
Gitblit v1.9.3