修改了多个bug

feige

2024-09-22 80e0b09695493b7f811f746dfb7158244088afe3

 ruoyi-ui/src/views/self/memo.vue

@@ -740,6 +740,8 @@
  getAutobiographyList, getAutobiographyTermList, addAutobiography, updateAutobiography,delAutobiography,
  getCategory,
} from "@/api/self/index";
import {getAllInfo} from "@/api/system/user"
import {showShareUser} from "@/api/bignote/index";
import {listNote,enload,getNote, addNote,updateNote, delNote,uploadPic} from "@/api/memo/index";

import { Notification, MessageBox, Message, Loading } from 'element-ui'
@@ -1004,26 +1006,40 @@
          })
        },
   getList1() {
          this.loading1 = true;
          this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
          this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
             this.queryParams.clanId = this.$store.state.user.clanId
          listUserAll(this.queryParams1).then(response => {
              this.listRoot = response.data.data;
              const kon = {}
              this.listRoot.forEach(element => {
                kon[element['nickName']] = element['userId']
              })
              for(let i in kon){
                this.userOptions.push({label: i,value: kon[i]})
    this.loading1 = true;
            let userId = this.$store.state.user.userId
          //  alert(userId)
    		  
            showShareUser(userId, 2062).then(response=>{
               console.log("===========ddddddddddddd")
               console.log(response.data)
               console.log("--------------------")
               response.data.forEach(element =>{
                   this.userOptions.push({label: element.oldName,value: element.userId})
               })
            })
    //         this.queryParams1.happenStartTime = this.dateRange1.length > 0 && this.dateRange1[0]
    //         this.queryParams1.happenEndTime = this.dateRange1.length > 0 && this.dateRange1[1]
          // //  alert(this.$store.state.user.clanId)
          //       this.listRoot = []
           let clanId = this.$store.state.user.clanId
            getAllInfo(clanId).then(response => {
                this.listRoot = response.data;
                const kon = {}
                      console.log(response.data,'userListuserListuserList99999999999999')
                this.listRoot.forEach(element => {
                  kon[element['nickName']] = element['userId']
                })
                // for(let i in kon){
                //   this.userOptions.push({label: i,value: kon[i]})
                // }
                // for(let i in this.userOptions){
                //   this.userList.push(this.userOptions[i].value)
                // }
                // console.log(this.userList,'userListuserListuserList99999999999999')
                this.loading1 = false;
              }
              for(let i in this.userOptions){
                this.userList.push(this.userOptions[i].value)
              }
              console.log(this.userList,'userListuserListuserList')
              this.loading1 = false;
            }
          );
            );
        },

    /** 查询记录列表 */