diff --git a/api/app/lib/controllers/overview/building.js b/api/app/lib/controllers/overview/building.js
index 28e00a34..bdc0764a 100644
--- a/api/app/lib/controllers/overview/building.js
+++ b/api/app/lib/controllers/overview/building.js
@@ -36,6 +36,10 @@ async function roadState(ctx) {
const projectRoadRes = await models.Project.findAll({
type: 'road',
})
+ //在建工程
+ const buildingCount = await models.Project.count({
+ where: { done: true }
+ })
const bridgeRes = await models.Bridge.findAll({})
let constructionYear = []
@@ -45,8 +49,8 @@ async function roadState(ctx) {
constructionYear.reverse()
const roadState = {
- //总数
- projectAll: projectRoadRes.length,
+ //在建总数
+ buildingCount: buildingCount,
// 在建数量
buildingRoad: 0,
// 已建数量
diff --git a/web/client/src/sections/organization/containers/user.js b/web/client/src/sections/organization/containers/user.js
index 2d0bef0f..2a4de927 100644
--- a/web/client/src/sections/organization/containers/user.js
+++ b/web/client/src/sections/organization/containers/user.js
@@ -25,7 +25,7 @@ const UserManage = (props) => {
const [depModalRecord, setDepModalRecord] = useState();
const [selectedTree, setSelectedTree] = useState();
const [depCrumbs, setDepCrumbs] = useState([]);
- const [depUserCopy, setDepUserCopy] = useState([])//用于存放除了自己的管理的数组,即自己不能调整自己是否为管理员
+ const [depUserCopy, setDepUserCopy] = useState([])
const [uid, setuid] = useState()
const [editAble, setEditAble] = useState(user?.username !== 'SuperAdmin' && user?.userResources?.find(i => i.resourceId === 'USERMANAGE')?.isshow === "true" ? true : '')//控制操作(新增删除等操作,对应权限的'不可编辑')是否可操作
const [depMessagedata, setdepMessagedata] = useState(depMessage)
@@ -274,9 +274,9 @@ const UserManage = (props) => {
setDepModalVisible(true)
setDepModalType('edit')
}} />
-