抄送人为学生和老师时的代码调整

frontend/wechat-web/src/modules/announce/AnnounceRelease.jsx

@@ -100,77 +100,61 @@ class AnnounceRelease extends Component {
     getOrganization = () => {
         Toast.loading('', 0)
 
-        fetchGet(API.USER_GETOBJECT, {
-            userId: this.props.userInfo.userId
+        fetchGet(API.getClazzByTeacherId, {
+            teacherId: this.props.userInfo.user.userFunId,
         }).then(response => {
             Toast.hide()
             const {targetData} = this.state
             targetData.length = 0
             if (response && response.data) {
-                const schoolArray = response.data.schools
-                const teacherArray = response.data.teachers
-
-                if (!isObjEmpty(teacherArray)) {
-                    const teacherData = []
-                    teacherArray.forEach((teacherObj, index) => {
-                        if (teacherObj) {
-                            teacherData.push({
-                                title: getStrValue(teacherObj, 'userName'),
-                                userId: getIntValue(teacherObj, 'userId'),
-                                userPhone: getStrValue(teacherObj, 'userPhone'),
-                                value: getStrValue(teacherObj, 'userName') + `-1-${index}`,
-                                key: `1-${index}`,
-                            })
-                        }
-                    })
-
-                    targetData.push({
-                        title: `全体老师`,
-                        value: `1`,
-                        key: `1`,
-                        children: teacherData,
-                    })
-                }
-
-                if (!isObjEmpty(schoolArray)) {
-                    const classData = []
-
-                    schoolArray.forEach((schoolObj, sIndex) => {
-                        if (schoolObj) {
-                            const parentArray = schoolObj.parents
-
-                            const parentData = []
-                            if (!isObjEmpty(parentArray)) {
-                                parentArray.forEach((parentObj, pIndex) => {
-                                    parentData.push({
-                                        title: getStrValue(parentObj, 'userName'),
-                                        userId: getIntValue(parentObj, 'userId'),
-                                        userPhone: getStrValue(parentObj, 'userPhone'),
-                                        value: getStrValue(parentObj, 'userName') + `-0-${sIndex}-${pIndex}`,
-                                        key: `0-${sIndex}-${pIndex}`,
-                                    })
-                                })
-
+                response.data.forEach((dataObj, data_index) => {
+                    const stusDOSArray = dataObj.studentDOS
+                    const teacherDOSArray = dataObj.teacherDOS
+                    if (!isObjEmpty(stusDOSArray)) {
+                        const classData = []
+                        stusDOSArray.forEach((stuObj, index) => {
+                            if (stuObj) {
                                 classData.push({
-                                    title: getStrValue(schoolObj, 'parentName') + getStrValue(schoolObj, 'schName'),
-                                    value: getStrValue(schoolObj, 'parentName') + getStrValue(schoolObj, 'schName') + `-0-${sIndex}`,
-                                    key: `0-${sIndex}`,
-                                    children: parentData,
+                                    title: getStrValue(stuObj, 'stuName'),
+                                    userId: getIntValue(stuObj, 'stuId'),
+                                    userPhone: getStrValue(stuObj, 'userPhone'),
+                                    value: `2-${data_index}-${index}-` + getStrValue(stuObj, 'stuName'),
+                                    key: `2-${data_index}-${index}`,
                                 })
                             }
-                        }
-                    })
-
-                    targetData.push({
-                        title: `全体家长`,
-                        value: `0`,
-                        key: `0`,
-                        children: classData,
-                    })
-                }
+                        })
+
+                        targetData.push({
+                            title: dataObj.gradeName + dataObj.clazzName + '全体学生',
+                            value: `2-${data_index}-` + dataObj.gradeName + dataObj.clazzName + '全体学生',
+                            key: `2-${data_index}`,
+                            children: classData,
+                        })
+                    }
+
+                    if (!isObjEmpty(teacherDOSArray)) {
+                        const teacherData = []
+                        teacherDOSArray.forEach((teacherObj, index) => {
+                            if (teacherObj) {
+                                teacherData.push({
+                                    title: getStrValue(teacherObj, 'teacherName'),
+                                    userId: getIntValue(teacherObj, 'teacherId'),
+                                    userPhone: getStrValue(teacherObj, 'userPhone'),
+                                    value: `0-${data_index}-${index}-` + getStrValue(teacherObj, 'teacherName'),
+                                    key: `0-${data_index}-${index}`,
+                                })
+                            }
+                        })
+
+                        targetData.push({
+                            title: dataObj.gradeName + dataObj.clazzName + '全体老师',
+                            value: `0-${data_index}-` + dataObj.gradeName + dataObj.clazzName + '全体老师',
+                            key: `0-${data_index}`,
+                            children: teacherData,
+                        })
+                    }
+                })
             }
-
-            console.log('targetData', targetData)
             this.setState({
                 targetData,
             })

frontend/wechat-web/src/modules/hiPages/send-vote/SendVote.js

@@ -41,7 +41,7 @@ class SendVote extends Component {
             const {targetData} = this.state
             targetData.length = 0
             if (response && response.data) {
-                response.data.forEach((dataObj,data_index) =>{
+                response.data.forEach((dataObj, data_index) => {
                     const stusDOSArray = dataObj.studentDOS
                     const teacherDOSArray = dataObj.teacherDOS
                     if (!isObjEmpty(stusDOSArray)) {
@@ -52,16 +52,16 @@ class SendVote extends Component {
                                     title: getStrValue(stuObj, 'stuName'),
                                     userId: getIntValue(stuObj, 'stuId'),
                                     userPhone: getStrValue(stuObj, 'userPhone'),
-                                    value: getStrValue(stuObj, 'stuName') + `-${data_index}-0-${index}`,
-                                    key: `${data_index}-0-${index}`,
+                                    value: `2-${data_index}-${index}-` + getStrValue(stuObj, 'stuName'),
+                                    key: `2-${data_index}-${index}`,
                                 })
                             }
                         })
 
                         targetData.push({
-                            title: dataObj.gradeName+dataObj.clazzName + '全部学生',
-                            value: `${data_index}-0`,
-                            key: `${data_index}-0`,
+                            title: dataObj.gradeName + dataObj.clazzName + '全体学生',
+                            value: `2-${data_index}-` + dataObj.gradeName + dataObj.clazzName + '全体学生',
+                            key: `2-${data_index}`,
                             children: classData,
                         })
                     }
@@ -74,22 +74,21 @@ class SendVote extends Component {
                                     title: getStrValue(teacherObj, 'teacherName'),
                                     userId: getIntValue(teacherObj, 'teacherId'),
                                     userPhone: getStrValue(teacherObj, 'userPhone'),
-                                    value: getStrValue(teacherObj, 'teacherName') + `${data_index}-1-${index}`,
-                                    key: `${data_index}-1-${index}`,
+                                    value: `0-${data_index}-${index}-` + getStrValue(teacherObj, 'teacherName'),
+                                    key: `0-${data_index}-${index}`,
                                 })
                             }
                         })
 
                         targetData.push({
-                            title: dataObj.gradeName+dataObj.clazzName + '全部老师',
-                            value: `${data_index}-1`,
-                            key: `${data_index}-1`,
+                            title: dataObj.gradeName + dataObj.clazzName + '全体老师',
+                            value: `0-${data_index}-` + dataObj.gradeName + dataObj.clazzName + '全体老师',
+                            key: `0-${data_index}`,
                             children: teacherData,
                         })
                     }
                 })
             }
-            console.log('targetData', targetData)
             this.setState({
                 targetData,
             })
@@ -260,8 +259,8 @@ class SendVote extends Component {
             Toast.fail('请填写投票主题...', 1)
             return
         }
-        for(let i=0;i<this.state.voteOptionss.length;i++){
-            if(this.state.voteOptionss[i] == null ||  this.state.voteOptionss[i].trim().length == 0 ){
+        for (let i = 0; i < this.state.voteOptionss.length; i++) {
+            if (this.state.voteOptionss[i] == null || this.state.voteOptionss[i].trim().length == 0) {
                 Toast.fail('存在选项内容为空...')
                 return
             }
@@ -271,7 +270,7 @@ class SendVote extends Component {
             Toast.fail('请选择投票类型...')
             return
         }
-        if (this.state.endValue == null ) {
+        if (this.state.endValue == null) {
             Toast.fail('请选择正确结束时间...')
             return
         }
@@ -302,7 +301,7 @@ class SendVote extends Component {
 
         var params = {
             topicName: this.state.voteTitle,
-            topicType:this.state.voteType[0],
+            topicType: this.state.voteType[0],
             topicFiles: approveFiles,
             creator: this.props.userInfo.userId,
 
@@ -311,7 +310,7 @@ class SendVote extends Component {
             voteName: this.state.voteTitle,
             voter: JSON.stringify(this.state.votePerson),
             voteEndDate: moment(this.state.endValue).format('YYYY-MM-DD HH:mm:ss'),
-            voteType:1,
+            voteType: 1,
             optionName: [
                 {
                     optionStatus: 1,

frontend/wechat-web/src/modules/homework/ReleaseAssignmentPage.js

@@ -306,78 +306,39 @@ class ReleaseAssignmentPage extends React.Component {
         Toast.loading('', 0)
 
         fetchGet(API.getClazzByTeacherId, {
-            teacherId: this.props.userInfo.user.userId
+            teacherId: this.props.userInfo.user.userFunId,
         }).then(response => {
             Toast.hide()
             const {targetData} = this.state
             targetData.length = 0
             if (response && response.data) {
-                const schoolArray = response.data.schools
-                const teacherArray = response.data.teachers
-
-                if (!isObjEmpty(teacherArray)) {
-                    const teacherData = []
-                    teacherArray.forEach((teacherObj, index) => {
-                        if (teacherObj) {
-                            teacherData.push({
-                                title: getStrValue(teacherObj, 'userName'),
-                                userId: getIntValue(teacherObj, 'userId'),
-                                userPhone: getStrValue(teacherObj, 'userPhone'),
-                                value: getStrValue(teacherObj, 'userName') + `-1-${index}`,
-                                key: `1-${index}`,
-                            })
-                        }
-                    })
-
-                    targetData.push({
-                        title: `全体老师`,
-                        value: `1`,
-                        key: `1`,
-                        children: teacherData,
-                    })
-                }
-
-                if (!isObjEmpty(schoolArray)) {
-                    const classData = []
-
-                    schoolArray.forEach((schoolObj, sIndex) => {
-                        if (schoolObj) {
-                            const parentArray = schoolObj.parents
-
-                            const parentData = []
-                            if (!isObjEmpty(parentArray)) {
-                                parentArray.forEach((parentObj, pIndex) => {
-                                    parentData.push({
-                                        title: getStrValue(parentObj, 'userName'),
-                                        userId: getIntValue(parentObj, 'userId'),
-                                        userPhone: getStrValue(parentObj, 'userPhone'),
-                                        value: getStrValue(parentObj, 'userName') + `-0-${sIndex}-${pIndex}`,
-                                        key: `0-${sIndex}-${pIndex}`,
-                                    })
-                                })
-
+                response.data.forEach((dataObj, data_index) => {
+                    const stusDOSArray = dataObj.studentDOS
+                    if (!isObjEmpty(stusDOSArray)) {
+                        const classData = []
+                        stusDOSArray.forEach((stuObj, index) => {
+                            if (stuObj) {
                                 classData.push({
-                                    title: getStrValue(schoolObj, 'parentName') + getStrValue(schoolObj, 'schName'),
-                                    value: getStrValue(schoolObj, 'parentName') + getStrValue(schoolObj, 'schName') + `-0-${sIndex}`,
-                                    key: `0-${sIndex}`,
-                                    children: parentData,
+                                    title: getStrValue(stuObj, 'stuName'),
+                                    userId: getIntValue(stuObj, 'stuId'),
+                                    userPhone: getStrValue(stuObj, 'userPhone'),
+                                    value: `2-${data_index}-${index}-` + getStrValue(stuObj, 'stuName'),
+                                    key: `2-${data_index}-${index}`,
                                 })
                             }
-                        }
-                    })
-
-                    targetData.push({
-                        title: `全体家长`,
-                        value: `0`,
-                        key: `0`,
-                        children: classData,
-                    })
-                }
+                        })
+
+                        targetData.push({
+                            title: dataObj.gradeName + dataObj.clazzName + '全体学生',
+                            value: `2-${data_index}` + dataObj.gradeName + dataObj.clazzName + '全体学生',
+                            key: `2-${data_index}`,
+                            children: classData,
+                        })
+                    }
+                })
             }
-
-            console.log('targetData', targetData)
             this.setState({
-                targetData
+                targetData,
             })
         }).catch(error => {
             Toast.hide()

frontend/wechat-web/src/modules/message/SystemMessage.jsx

@@ -72,8 +72,8 @@ export default class SystemMessage extends Component {
                     if (!isObjEmpty(dataArray) && dataArray != []) {
                         dataArray.forEach((dataObject, index) => {
                             systemMsgs.push({
-                                time: getStrValue(dataObject, 'creat_date'),
-                                content: getStrValue(dataObject, 'notify_details')
+                                time: getStrValue(dataObject, 'createDate'),
+                                content: getStrValue(dataObject, 'notifyDetails')
                             })
                         })
                     } else {

frontend/wechat-web/src/modules/message/UseHelp.jsx

@@ -72,8 +72,8 @@ export default class UseHelp extends Component {
                     if (!isObjEmpty(dataArray) && dataArray != []) {
                         dataArray.forEach((dataObject, index) => {
                             helpList.push({
-                                title: getStrValue(dataObject, 'notify_name'),
-                                content: getStrValue(dataObject, 'notify_details')
+                                title: getStrValue(dataObject, 'notifyTitle'),
+                                content: getStrValue(dataObject, 'notifyDetails')
                             })
                         })
                     } else {