管理员权限修改

api/app/lib/controllers/organization/index.js

@@ -74,7 +74,7 @@ async function editUser (ctx) {
       if (existUserRes) {
          // 存在且传递id 或者 不传id也存在
          // 修改 update
-         storageData.deleted = false
+
          if (
             role.includes('admin')
          ) {
@@ -89,6 +89,8 @@ async function editUser (ctx) {
             // 正在修改成员 但是此时还是管理员
             storageData.disabled = true
             storageData.role = [...role, 'admin']
+         }else{
+            storageData.deleted = false
          }
          await models.User.update(storageData, {
             where: {
@@ -165,6 +167,9 @@ async function delAdmin (ctx) {
          let adminIndex = updateValues.role.findIndex(r => r == 'admin')
          if (adminIndex > -1) {
             updateValues.role.splice(adminIndex, 1)
+            if (updateValues.role.length < 1) {
+               updateValues.deleted = true
+            }
          }
          await models.User.update(updateValues, {
             where: {

web/client/src/sections/install/containers/roles.jsx

@@ -344,6 +344,8 @@ const Roles = (props) => {
    const mylimits = useRef(); //每页实际条数
    const [pepList, setPepList] = useState([])//角色分配
    const [pomsList, setPomsList] = useState([])//已绑定项目列表
+
+   const userAdmin = user?.pomsUserInfo?.role.includes('admin')  //判断当前用户是否为管理员
    useEffect(() => {
       getUserList();
    }, [query, roleChoose]);
@@ -367,6 +369,7 @@ const Roles = (props) => {
             for (let i = 0; i < notCreatedNum; i++) {
                notCreatedArr.push('')
             }
+            if (userAdmin) notCreatedArr = []
             setRoleAssignment(res.payload.data.admin.concat(notCreatedArr))
             setLimits(res.payload.data.users.count)
             mylimits.current = res.payload.data.users.rows.length
@@ -462,7 +465,7 @@ const Roles = (props) => {
                                           )
                                        }
 
-                                                    <div style={{ marginLeft: 4, cursor: "pointer", }} onClick={() => {
+                                       {userAdmin ? "" : <><div style={{ marginLeft: 4, cursor: "pointer", }} onClick={() => {
                                           if (item.id) {
                                              setEditObj(item)
                                              setAdminEdit(true)
@@ -492,7 +495,7 @@ const Roles = (props) => {
                                                 </Popconfirm>
 
                                              ) : ('')
-                                                    }
+                                          }</>}
 
                                     </div>
                                     <div style={{ fontSize: 12, color: '#969799', marginTop: 28, marginLeft: 50 }}>角色说明：拥有全平台的权限</div>