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

base-servers/file/file-storage-fdfs/src/main/java/com/usoftchina/smartschool/file/storage/fdfs/FdfsFileStorageClient.java

@@ -4,8 +4,6 @@ import com.github.tobato.fastdfs.domain.StorePath;
 import com.github.tobato.fastdfs.service.FastFileStorageClient;
 import com.usoftchina.smartschool.file.storage.FileMetadata;
 import com.usoftchina.smartschool.file.storage.FileStorageClient;
-import com.usoftchina.smartschool.file.storage.util.FileType;
-import com.usoftchina.smartschool.file.storage.util.FileTypeUtils;
 import org.apache.commons.io.IOUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 
@@ -24,16 +22,8 @@ public class FdfsFileStorageClient implements FileStorageClient{
 
     @Override
     public String uploadFile(InputStream inputStream, FileMetadata metadata) {
-        FileType type = FileTypeUtils.getFileType(metadata.getMime(), metadata.getExt());
-        StorePath storePath;
-        if (FileType.IMAGE == type) {
-            // 保存图片 + 生成缩略图
-            storePath = storageClient.uploadImageAndCrtThumbImage(inputStream, metadata.getSize(),
-                    metadata.getExt(), null);
-        } else {
-            storePath = storageClient.uploadFile(inputStream, metadata.getSize(),
-                    metadata.getExt(), null);
-        }
+        StorePath storePath = storageClient.uploadFile(inputStream, metadata.getSize(),
+                metadata.getExt(), null);
         return storePath.getFullPath();
     }
 

frontend/wechat-web/src/modules/hiPages/approvel/Approvel.js

@@ -114,16 +114,18 @@ class Approvel extends Component {
                 height={this.state.height}>
                 <Skeleton loading={this.state.isMyapplyding} active paragraph={{rows: 3}}>
                     {
+                        this.state.applyList.length > 0 ?
                         this.state.applyList.map((itemdata,index) =>
                             <ApprovelItem itemdata={itemdata} isMyApply={true}   index={index} onItemClick={this.onItemClick.bind(this)}/>
-                        )
+                        ) :
+                            <List dataSource={this.state.applyList}
+                                  renderItem={(applyListBean,index) => (
+                                      <List.Item>
+                                          <ApprovelItem itemdata={applyListBean} isMyApply={true}   index={index} onItemClick={this.onItemClick.bind(this)}/>
+                                      </List.Item>
+                                  )}/>
                     }
-                    {/*<List dataSource={this.state.applyList}*/}
-                          {/*renderItem={(applyListBean,index) => (*/}
-                              {/*<List.Item>*/}
-                                  {/*<ApprovelItem itemdata={applyListBean} isMyApply={true}   index={index} onItemClick={this.onItemClick.bind(this)}/>*/}
-                              {/*</List.Item>*/}
-                          {/*)}/>*/}
+
                 </Skeleton>
             </RefreshLayout>
 
@@ -137,16 +139,18 @@ class Approvel extends Component {
                 height={this.state.height}>
                 <Skeleton loading={this.state.isMyapprovedload} active paragraph={{rows: 3}}>
                     {
+                        this.state.approvelList.length > 0 ?
                         this.state.approvelList.map((itemdata,index) =>
                             <ApprovelItem itemdata={itemdata}isMyApply={false}  index={index} onItemClick={this.onItemClick.bind(this)}/>
-                        )
+                        ) :
+                        <List dataSource={this.state.approvelList}
+                        renderItem={(approvelListBean,index) => (
+                        <List.Item>
+                            <ApprovelItem itemdata={approvelListBean}isMyApply={false}  index={index} onItemClick={this.onItemClick.bind(this)}/>
+                        </List.Item>
+                    )}/>
                     }
-                    {/*<List dataSource={this.state.approvelList}*/}
-                          {/*renderItem={(approvelListBean,index) => (*/}
-                              {/*<List.Item>*/}
-                                  {/*<ApprovelItem itemdata={approvelListBean}isMyApply={false}  index={index} onItemClick={this.onItemClick.bind(this)}/>*/}
-                              {/*</List.Item>*/}
-                          {/*)}/>*/}
+
                 </Skeleton>
             </RefreshLayout>
 

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

@@ -68,28 +68,29 @@ class LeaveListPage extends React.Component{
 
     render(){
         return <div   style={{background: '#F2F2F2'}}>
-            {
-                this.state.data.length > 0 ?
+
                     <RefreshLayout
                         refreshing={this.state.isRefreshing}
                         ref={el => {
                             this.container = el
                         }}
                         onRefresh={this.getListData}>
+                        {
+                            this.state.data.length > 0 ?
+                                this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>)
+                                :
+                                <List dataSource={this.state.data}
+                                      renderItem={(itemdata,index) =>(
+                                          <List.Item  >
+                                              <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
+                                          </List.Item>
+                                      )}/>
+                        }
                         <Skeleton loading={this.state.isLoading} active paragraph={{rows: 3}}>
                             {this.state.data.map((itemdata,index) =>  <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
                             )}
-                            {/*  <List dataSource={this.state.data}
-                                  renderItem={(itemdata,index) =>(
-                                      <List.Item  >
-                                          <LeaveItem itemdata={itemdata} role={this.state.role} index = {index} onItemClick={this.onItemClick.bind(this)}></LeaveItem>
-                                      </List.Item>
-                                  )}/>*/}
                         </Skeleton>
                     </RefreshLayout>
-                    :
-                    <div className="no_data"><img src={nodata_img} alt="" style={{width:'100%',height:'100%'}}/></div>
-            }
 
                     {
                         this.state.role=="teacher"?(""):(<Icon type="plus-circle" theme='filled' className='common-add-icon'
@@ -173,6 +174,7 @@ class LeaveListPage extends React.Component{
                 }
                 this.setState({
                     data: this.state.data,
+                    // data:[],
                     isRefreshing: false,
                     isLoading: false
                 })