Merge branch 'dev' of ssh://10.10.100.21/source/smartschool-platform into dev

applications/school/school-server/src/main/java/com/usoftchina/smartschool/school/basic/service/impl/TeacherServiceImpl.java

@@ -160,6 +160,11 @@ public class TeacherServiceImpl implements TeacherService{
                         Long userId = createAccount(teacher);
                         teacher.setUser_id(userId);
                     }
+                    Integer count;
+                    count = sysTeacherMapper.count(teacher.getTeacher_number(),schoolId);
+                    if(count > 0){
+                        throw new BizException(BizExceptionCode.REPEAT_TEACHER_NUMBER);
+                    }
                     sysTeacherMapper.insertSelective(teacher);
                     teachers.add(teacher);
                     //年纪存在、需要更新

frontend/wechat-web/src/components/UploadEnclosure.jsx

@@ -10,12 +10,14 @@ import {isObjEmpty, isObjNull} from "../utils/common";
 import ImagesViewer from '../components/imagesVIewer/index'
 import PropTypes from 'prop-types';
 import 'css/upload.css'
+import {_baseURL} from "../configs/api.config";
 
 let uploadFail = false;
 export default class UploadEnclosure extends Component {
 
     static propTypes = {
         action: PropTypes.string.isRequired,//上传地址
+        data: PropTypes.object,//上传所需参数
         accept: PropTypes.string,//接受上传的文件类型
         listType: PropTypes.string,//附件列表格式，默认picture-card
         count: PropTypes.number,//附件限制数量，默认为1
@@ -32,6 +34,9 @@ export default class UploadEnclosure extends Component {
     static defaultProps = {
         listType: 'picture-card',
         count: 1,
+        data: {
+            folderId: 0
+        },
         multiple: false,
         title: '附件',
         needPoint: true,
@@ -65,7 +70,7 @@ export default class UploadEnclosure extends Component {
         const {fileList} = this.state
         const {
             action, listType, count, multiple,
-            title, needPoint, limit, accept
+            title, needPoint, limit, accept, data
         } = this.props
 
         const imgs = []
@@ -97,6 +102,7 @@ export default class UploadEnclosure extends Component {
                     <Upload
                         action={action}
                         accept={accept}
+                        data={data}
                         listType={listType}
                         fileList={fileList}
                         multiple={multiple}
@@ -142,10 +148,19 @@ export default class UploadEnclosure extends Component {
     }
 
     handleChange = ({fileList}) => {
+        console.log('filelist', fileList)
         if (uploadFail) {
             return
         }
         if (fileList.length <= this.props.count || !this.props.limit) {
+            if (fileList) {
+                fileList.forEach((value, index) => {
+                    value.url = (value.response && value.response.data) ? value.response.data.accessPath : value.url
+                    value.picUrl = value.url
+                    value.relativeUrl = (value.response && value.response.data) ? value.response.data.fullPath : value.relativeUrl
+                })
+            }
+
             this.setState({fileList})
             this.props.handleChange(fileList)
         }

frontend/wechat-web/src/modules/album/UploadImage.jsx

@@ -135,11 +135,6 @@ export default class UploadImage extends Component {
 
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
         }
     }

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

@@ -291,11 +291,6 @@ class AnnounceRelease extends Component {
 
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
         }
     }

frontend/wechat-web/src/modules/hiPages/field-trip/FieldTrip.js

@@ -398,11 +398,6 @@ class FieldTrip extends Component {
     }
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
         }
     }

frontend/wechat-web/src/modules/hiPages/res_apply/ResApply.js

@@ -124,11 +124,6 @@ class ResApply extends Component{
     }
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
         }
     }

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

@@ -436,11 +436,6 @@ class SendVote extends Component {
     }
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
         }
     }

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

@@ -84,7 +84,7 @@ class AssignmentDetailPage extends React.Component {
                 if (response.data.taskFiles) {
                     let temps = JSON.parse(response.data.taskFiles);
                     for (let i = 0; i < temps.length; i++) {
-                        images.push(_baseURL + temps[i]);
+                        images.push(temps[i]);
                     }
                 }
                 if (response.data.taskContext) {

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

@@ -52,11 +52,6 @@ class ReleaseAssignmentPage extends React.Component {
 
     handleChange = (fileList) => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
         }
 

frontend/wechat-web/src/modules/leave/LeaveAddCPage.js

@@ -293,10 +293,6 @@ class LeaveAddCPage extends Component {
     }
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
             this.setState({fileList})
         }
     }

frontend/wechat-web/src/modules/leave/LeaveAddPage.js

@@ -255,10 +255,6 @@ class LeaveAddPage extends Component{
     }
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
             this.setState({fileList})
         }
     }

frontend/wechat-web/src/modules/principalMailbox/PrincipalMailbox.jsx

@@ -142,11 +142,6 @@ class PrincipalMailbox extends Component {
 
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
         }
     }

frontend/wechat-web/src/modules/user/UserInfo.js

@@ -210,11 +210,6 @@ class UserInfo extends Component {
 
     handleChange = fileList => {
         if (fileList) {
-            fileList.forEach((value, index) => {
-                value.url = value.response ? (_baseURL + value.response.data) : value.url
-                value.picUrl = value.response ? value.response.data : value.picUrl
-            })
-
             this.setState({fileList})
 
             if (fileList[0].status === 'error') {