Merge branch 'master' of g.civnet.cn:ReactWeb5/maintenance

src/pages/userCenter/siteManage/SiteManage.jsx

@@ -229,7 +229,11 @@ const SiteManage = props => {
     dataList[index].isChecked = e.target.checked;
     dataList[index].Users.forEach(item => {
       item.isChecked = e.target.checked;
+      let delIndex = selectList.findIndex(
+        v => v.GroupId === dataList[index].GroupId && v.userID === item.userID,
+      );
       if (e.target.checked) {
+        if (delIndex === -1) {
           selectList.push({
             GroupId: dataList[index].GroupId,
             GroupName: dataList[index].GroupName,
@@ -238,8 +242,8 @@ const SiteManage = props => {
             isChecked: dataList[index].isChecked,
           });
         }
+      }
       if (!e.target.checked) {
-        let delIndex = selectList.findIndex(v => v.userID === item.userID);
         selectList.splice(delIndex, 1);
       }
     });
@@ -252,7 +256,9 @@ const SiteManage = props => {
     dataList[index].Users[vIndex].isChecked = e.target.checked;
     let checked = isAllChecked(index);
     let hasIndex = selectList.findIndex(
-      item => item.userID === dataList[index].Users[vIndex].userID,
+      item =>
+        item.userID === dataList[index].Users[vIndex].userID &&
+        item.GroupId === dataList[index].GroupId,
     );
     dataList[index].isChecked = checked;
     if (hasIndex === -1) {