src/main/java/com/jeeplus/modules/projectcontentinfo/web/ProjectcontentinfoController.java

@@ -788,7 +788,7 @@ public class ProjectcontentinfoController extends BaseController {
 	//
 	@RequestMapping(value = {"saveReport"})
 	public String saveReport(Projectcontentinfo projectcontentinfo, HttpServletRequest request, HttpServletResponse response,
-							 Model model,RedirectAttributes redirectAttributes) {
+							 Model model,RedirectAttributes redirectAttributes)  {
 		try{
 			String str = projectcontentinfoService.saveData(projectcontentinfo,2);
 			addMessage(redirectAttributes, "发起报告审批"+(str.equals("true")?"成功":"失败"));

src/main/java/com/jeeplus/modules/projectrecord/dao/WorkProjectUserDao.java

@@ -3,6 +3,7 @@ package com.jeeplus.modules.projectrecord.dao;
 import com.jeeplus.common.persistence.annotation.MyBatisDao;
 import com.jeeplus.modules.projectrecord.entity.ProjectRecords;
 import com.jeeplus.modules.sys.entity.User;
+import com.jeeplus.modules.workstaff.entity.WorkStaffBasicInfo;
 import org.apache.ibatis.annotations.Param;
 
 import java.util.HashMap;
@@ -23,4 +24,7 @@ public interface WorkProjectUserDao {
     List<User> projectUsers(@Param("projectId")String projectId);
     List<User> queryAllProjectUsers(@Param("projectId")String projectId);
     void deleteProjectMasterMembers(HashMap<String, Object> map);
+
+    int reInsertUser(ProjectRecords projectRecords);
+//    int reInsertUser(@Param("projectId")String projectId,@Param("userId")String userId);
 }

src/main/java/com/jeeplus/modules/projectrecord/web/ProjectRecordsUserController.java

@@ -166,7 +166,8 @@ public class ProjectRecordsUserController extends BaseController {
 			for (String id :delUserIds.split(",")){
 				projectRecords.setUserId(id);
 				projectRecords.setDelFlag("0");
-				workProjectUserDao.deleteUsers(projectRecords);
+//				workProjectUserDao.deleteUsers(projectRecords);
+				workProjectUserDao.reInsertUser(projectRecords);
 			}
 
 		}

src/main/java/com/jeeplus/modules/workstaff/service/WorkStaffBasicInfoService.java

@@ -13,8 +13,10 @@ import java.util.*;
 
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
+import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.config.Global;
 import com.jeeplus.common.oss.OSSClientUtil;
+import com.jeeplus.common.utils.FileUtils;
 import com.jeeplus.common.utils.IdGen;
 import com.jeeplus.common.utils.MenuStatusEnum;
 import com.jeeplus.common.utils.StringUtils;
@@ -277,8 +279,8 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
         MultipartFile pictureFile = workStaffBasicInfo.getPictureFile();
         if (pictureFile != null && !pictureFile.isEmpty() &&pictureFile.getSize()>0) {
             String oldPhoto = workStaffBasicInfo.getPicture();
-            String key = "";
-            if (StringUtils.isNotBlank(oldPhoto)) {
+            BOSClientUtil bosClientUtil = new BOSClientUtil();
+            /*if (StringUtils.isNotBlank(oldPhoto)) {
                 String aliyunUrl = Global.getAliyunUrl();
                 String aliDownloadUrl = Global.getAliDownloadUrl();
                 String cons = "";
@@ -299,11 +301,15 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
                 }
             }catch (Exception e){
                 logger.error("oss删除文件失败！");
-            }
+            }*/
             try {
-                OSSClientUtil ossUtil2 = new OSSClientUtil();
-                String filepath = ossUtil2.uploadFile2OSS(pictureFile, "photo");
-                workStaffBasicInfo.setPicture(filepath);
+                if(StringUtils.isNotBlank(oldPhoto)){
+                    bosClientUtil.deleteObject(oldPhoto);
+                }
+                String path = new StringBuilder("/headImg/")
+                        .append(workStaffBasicInfo.getName()+System.currentTimeMillis()).append(".png").toString();
+                String uploadPath = bosClientUtil.upload(path, pictureFile.getInputStream());
+                workStaffBasicInfo.setPicture(uploadPath);
             } catch (Exception e) {
                 logger.error("oss上传文件失败！");
             }
@@ -795,20 +801,22 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
                     if(newInvoke==null)continue;
                     if(newInvoke instanceof String){
                         String newValue=newInvoke.toString();
-                        String oldValue=oldInvoke.toString();
+                        String oldValue = "";
+                        if (oldInvoke!=null)
+                            oldValue = oldInvoke.toString();
                         if(!newValue.equals(oldValue)){
                             if("exSoldier".equals(name)){
                                 workStaffAchivesLogService.saveStaffLog(workStaffAchivesLog,workStaffBasicInfo.getId(),
                                         "基本信息",describes,name,
                                         DictUtils.getDictLabel(oldValue,"yes_no",""),
                                         DictUtils.getDictLabel(newValue,"yes_no",""),
-                                        oldInvoke.toString(),
-                                        newInvoke.toString(),
+                                        oldValue,
+                                        newValue,
                                         "","修改");
                             }else{
                                 workStaffAchivesLogService.saveStaffLog(workStaffAchivesLog,workStaffBasicInfo.getId(),
                                         "基本信息",describes,name,
-                                        oldInvoke.toString(),newInvoke.toString(),oldInvoke.toString(),newInvoke.toString(),"","修改");
+                                        oldValue,newValue,oldValue,newValue,"","修改");
                             }
 
                         }

src/main/java/com/jeeplus/modules/workstaff/web/WorkStaffBasicInfoController.java

@@ -20,6 +20,7 @@ import com.google.common.collect.Maps;
 import com.jeeplus.common.bos.BOSClientUtil;
 import com.jeeplus.common.json.AjaxJson;
 import com.jeeplus.common.oss.OSSClientUtil;
+import com.jeeplus.common.utils.FileUtils;
 import com.jeeplus.modules.sys.entity.Area;
 import com.jeeplus.modules.sys.entity.Role;
 import com.jeeplus.modules.sys.service.RoleService;
@@ -232,6 +233,8 @@ public class WorkStaffBasicInfoController extends BaseController {
             BOSClientUtil bosClientUtil = new BOSClientUtil();
 			String url = bosClientUtil.upload(path, inputStream);
             workStaffBasicInfo.setPicture(url);
+		}else{
+			workStaffBasicInfo.setPicture("");
 		}
 
 		if(!workStaffBasicInfo.getIsNewRecord()){//编辑表单保存
@@ -519,6 +522,9 @@ public class WorkStaffBasicInfoController extends BaseController {
 			workProjectNotify.setNotifyId(workStaffBasicInfo.getId());
 			workProjectNotifyService.readByNotifyId(workProjectNotify);
 		}
+		if (workStaffBasicInfo.getPictureFile() == null || workStaffBasicInfo.getPictureFile().getSize() < 0) {
+			workStaffBasicInfo.setPicture("");
+		}
 		workStaffBasicInfoService.completeApply(workStaffBasicInfo.getId());
 		workStaffBasicInfoService.saveLog(workStaffBasicInfo);
 		addMessage(redirectAttributes, "申请员工档案信息成功");
@@ -631,11 +637,14 @@ public class WorkStaffBasicInfoController extends BaseController {
 		if (!beanValidator(model, workStaffBasicInfo)){
 			return form(workStaffBasicInfo, model,false);
 		}
-			WorkStaffBasicInfo select = new WorkStaffBasicInfo();
-			select.setAchiveId(workStaffBasicInfo.getId());
-			WorkStaffBasicInfo t = workStaffBasicInfoService.getAchive(select);//从数据库取出记录的值
-			MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
-			workStaffBasicInfoService.saveAchiveApply(t,request);//保存
+		WorkStaffBasicInfo basicInfo = workStaffBasicInfoService.getBasicInfoByAchiveId(workStaffBasicInfo.getId());
+		WorkStaffBasicInfo select = new WorkStaffBasicInfo();
+		select.setAchiveId(workStaffBasicInfo.getId());
+		WorkStaffBasicInfo t = workStaffBasicInfoService.getAchive(select);//从数据库取出记录的值
+		MyBeanUtils.copyBeanNotNull2Bean(workStaffBasicInfo, t);//将编辑表单中的非NULL值覆盖数据库记录中的值
+		workStaffBasicInfoService.saveAchiveApply(t, request);//保存
+		t.setId(basicInfo.getId());
+		workStaffBasicInfoService.save(t);
 		addMessage(redirectAttributes, "保存员工档案信息成功");
 		return "redirect:" + Global.getAdminPath() + "/home/?repage";
 	}

src/main/resources/mappings/modules/workProjectUser/WorkProjectUserDao.xml

@@ -72,4 +72,10 @@
     <select id="queryAllProjectUsers" resultType="com.jeeplus.modules.sys.entity.User">
         SELECT u.id,u.name,u.photo from work_project_user a, sys_user u WHERE a.user_id = u.id and a.project_id = #{projectId} and a.del_flag = '0'
     </select>
+
+    <update id="reInsertUser" parameterType="ProjectRecords">
+        update work_project_user
+        set del_flag = #{delFlag}
+        where project_id = #{id} and user_id = #{userId}
+    </update>
 </mapper>

src/main/webapp/webpage/modules/projectcontentinfo/reportForm.jsp

@@ -359,7 +359,10 @@
 						<c:forEach items="${projectcontentinfo.projectReportData.projectBasedDataList}" var="projectBasedData" varStatus="idx">
 							<tr>
 								<td class="hide">
-									<input type="hidden" id="workBaseDataList${idx.index}_id" value="${projectBasedData.id}" class="clientId">
+									<input id="workBaseDataList${idx.index}_id"      name="projectReportData.projectBasedDataList[${idx.index}].id"     type="hidden" value="${projectBasedData.id}"  class="clientId">
+									<input id="workBaseDataList${idx.index}_number"	 name="projectReportData.projectBasedDataList[${idx.index}].number" type="hidden" value="${projectBasedData.number}"/>
+									<input id="workBaseDataList${idx.index}_name" 	 name="projectReportData.projectBasedDataList[${idx.index}].name"   type="hidden" value="${projectBasedData.name}"/>
+									<input id="workBaseDataList${idx.index}_type"	 name="projectReportData.projectBasedDataList[${idx.index}].type"   type="hidden" value="${projectBasedData.type}"/>
 								</td>
 								<td style="text-align:center;">
 										${projectBasedData.number}
@@ -528,12 +531,12 @@
 				<table id="contentTable" class="table details table-bordered table-condensed">
 					<thead>
 					<tr>
-						<th style="text-align: center;width:15%">工作内容编号</th>
+						<th style="text-align: center;width:10%">工作内容编号</th>
 						<th style="text-align: center;width:20%">工作内容名称</th>
-						<th style="text-align: center;width:15%">工作内容类型</th>
+						<th style="text-align: center;width:25%">工作内容类型</th>
 						<th style="text-align: center;width:15%">负责人</th>
 						<th style="text-align: center;width:20%">创建时间</th>
-						<th style="text-align: center;width:15%">操作</th>
+						<th style="text-align: center;width:10%">操作</th>
 					</tr>
 					</thead>
 					<tbody id="projectContentDataList">

src/main/webapp/webpage/modules/projectcontentinfo/reportModifyApply.jsp

@@ -4,6 +4,11 @@
 <head>
 	<title>报告详情管理</title>
 	<meta name="decorator" content="default"/>
+	<style type="text/css">
+		table td{
+			text-align: center;
+		}
+	</style>
 	<script type="text/javascript">
         var validateForm;
         function doSubmit(obj){//回调函数，在编辑和保存动作时，供openDialog调用提交表单。
@@ -350,21 +355,24 @@
 						<c:forEach items="${projectcontentinfo.projectReportData.projectBasedDataList}" var="projectBasedData" varStatus="idx">
 							<tr>
 								<td class="hide">
-									<input type="hidden" id="workBaseDataList${idx.index}_id" value="${projectBasedData.id}" class="clientId">
+									<input id="workBaseDataList${idx.index}_id"      name="projectReportData.projectBasedDataList${idx.index}.id"     type="hidden" value="${projectBasedData.id}"  class="clientId">
+									<input id="workBaseDataList${idx.index}_number"	 name="projectReportData.projectBasedDataList${idx.index}.number" type="hidden" value="${projectBasedData.number}"/>
+									<input id="workBaseDataList${idx.index}_name" 	 name="projectReportData.projectBasedDataList${idx.index}.name"   type="hidden" value="${projectBasedData.name}"/>
+									<input id="workBaseDataList${idx.index}_type"	 name="projectReportData.projectBasedDataList${idx.index}.type"   type="hidden" value="${projectBasedData.type}"/>
 								</td>
-								<td style="text-align:center;">
+								<td  >
 										${projectBasedData.number}
 								</td>
-								<td style="text-align:center;">
+								<td  >
 										${projectBasedData.name}
 								</td>
-								<td style="text-align:center;">
+								<td  >
 										${fns:getDictLabel(projectBasedData.type, 'project_document_type', '')}
 								</td>
-								<td style="text-align:center;">
+								<td  >
 										${projectBasedData.uploadUser.name}
 								</td>
-								<td style="text-align:center;">
+								<td  >
 									<fmt:formatDate value="${projectBasedData.uploadDate}" pattern="yyyy-MM-dd"/>
 								</td>
 
@@ -384,19 +392,19 @@
                         <input id="workBaseDataList{{idx}}_name" name="projectReportData.projectBasedDataList[{{idx}}].name" type="hidden" value="{{row.name}}"/>
                         <input id="workBaseDataList{{idx}}_type" name="projectReportData.projectBasedDataList[{{idx}}].type" type="hidden" value="{{row.type}}"/>
                     </td>
-                    <td style="text-align:center;">
+                    <td>
                         {{row.number}}
                     </td>
-                    <td style="text-align:center;">
+                    <td>
                         {{row.name}}
                     </td>
-                    <td style="text-align:center;">
+                    <td>
                         {{row.typeLabel}}
                     </td>
-                    <td style="text-align:center;">
+                    <td>
                         {{row.uploadUser.name}}
                     </td>
-                    <td style="text-align:center;">
+                    <td>
                         {{row.uploadDate}}
                     </td>
                     <td class="text-center op-td">
@@ -519,12 +527,12 @@
 					<table id="contentTable" class="table table-striped table-bordered table-hover table-condensed dataTables-example dataTable">
 						<thead>
 						<tr>
-							<th style="text-align: center;width:15%">工作内容编号</th>
+							<th style="text-align: center;width:10%">工作内容编号</th>
 							<th style="text-align: center;width:20%">工作内容名称</th>
-							<th style="text-align: center;width:15%">工作内容类型</th>
+							<th style="text-align: center;width:25%">工作内容类型</th>
 							<th style="text-align: center;width:15%">负责人</th>
 							<th style="text-align: center;width:20%">创建时间</th>
-							<th style="text-align: center;width:15%">操作</th>
+							<th style="text-align: center;width:10%">操作</th>
 						</tr>
 						</thead>
 						<tbody id="projectContentDataList">
@@ -561,19 +569,19 @@
                 <input id="projectContentDataList{{idx}}_id" name="projectReportData.projectContentDataList[{{idx}}].id" type="hidden" value="{{row.id}}"/>
                 <input id="projectContentDataList{{idx}}_delFlag" name="projectReportData.projectContentDataList[{{idx}}]._delFlag" type="hidden" value="0"/>
             </td>
-            <td style="text-align:center;">
+            <td  >
                 {{row.number}}
             </td>
-            <td style="text-align:center;">
+            <td  >
                 {{row.name}}
             </td>
-            <td style="text-align:center;">
+            <td  >
                 {{row.typeName}}
             </td>
-            <td style="text-align:center;">
+            <td  >
                 {{row.master.name}}
             </td>
-            <td style="text-align:center;">
+            <td  >
                 {{row.createDate}}
             </td>
             <td class="text-center" width="10">

src/main/webapp/webpage/modules/workclientinfo/workClientInfoForm.jsp

@@ -589,33 +589,33 @@
                             <tr>
                                    <td class="hide">
                                        <input id="workClientLinkmanList${status.index + 1}_id"
-                                              name="workClientLinkmanList${status.index + 1}.id" type="hidden"
+                                              name="workClientLinkmanList[${status.index + 1}].id" type="hidden"
                                               value="${workClientLinkman.id}"/>
                                        <input id="workClientLinkmanList${status.index + 1}_delFlag"
-                                              name="workClientLinkmanList${status.index + 1}.delFlag" type="hidden"
+                                              name="workClientLinkmanList[${status.index + 1}].delFlag" type="hidden"
                                               value="0" readonly/>
                                    </td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_name"
-                                              name="workClientLinkmanList${status.index + 1}.name" type="text"
+                                              name="workClientLinkmanList[${status.index + 1}].name" type="text"
                                               value="${workClientLinkman.name}" readonly class="form-control required"/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_office"
-                                              name="workClientLinkmanList${status.index + 1}.office" type="text"
+                                              name="workClientLinkmanList[${status.index + 1}].office" type="text"
                                               value="${workClientLinkman.office}" readonly class="form-control "/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_position"
-                                              name="workClientLinkmanList${status.index + 1}.position" type="text"
+                                              name="workClientLinkmanList[${status.index + 1}].position" type="text"
                                               value="${workClientLinkman.position}" readonly class="form-control "/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_qq"
-                                              name="workClientLinkmanList${status.index + 1}.qq"
+                                              name="workClientLinkmanList[${status.index + 1}].qq"
                                               type="text" value="${workClientLinkman.qq}" readonly class="form-control digits"/>
                                    </td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_linkMobile"
-                                              name="workClientLinkmanList${status.index + 1}.linkMobile" type="text"
+                                              name="workClientLinkmanList[${status.index + 1}].linkMobile" type="text"
                                               value="${workClientLinkman.linkMobile}" readonly class="form-control isPhone"/></td>
                                    <td><input id="workClientLinkmanList${status.index + 1}_linkPhone"
-                                              name="workClientLinkmanList${status.index + 1}.linkPhone" type="text"
+                                              name="workClientLinkmanList[${status.index + 1}].linkPhone" type="text"
                                               value="${workClientLinkman.linkPhone}" readonly class="form-control isTel"/></td>
                                    <td><input id="workClientLinkmanList{{idx}}_email"
-                                              name="workClientLinkmanList${status.index + 1}.email" type="text"
+                                              name="workClientLinkmanList[${status.index + 1}].email" type="text"
                                               value="${workClientLinkman.email}"
                                               class="form-control email" readonly/></td>
                                    <td class="text-center op-td">

src/main/webapp/webpage/modules/workstaff/workStaffAchiveInfoForm.jsp

@@ -110,7 +110,7 @@
             var this_upload_div_1 =
                 '<div id="this_upload_div_'+ index + '" style="position:relative;">'+
                 '<img  id="this_upload_image_' + index + '" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button('+index+')"/>'+
-                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="this_upload_files"  onchange="this_upload_show_image('+index+ ')" /><br>'+
+                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image('+index+ ')" /><br>'+
                 '</div>';
             $("#this_upload_image_div_"+ index).html("").append(this_upload_div_1);
         }

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailAudit.jsp

@@ -38,6 +38,10 @@
                                 $("#nativePlaceId").val(data.newKey);
                                 $("#nativePlaceName").val(data.newValue);
                                 $("#nativePlaceName").css("color","red");
+                            }else if(name=="picture"){
+                                $("#this_upload_image_1").prop("src",data.newValue);
+                                $("#picture").val(data.newValue);
+                                // this_upload_show_image("1");
                             }else{
                                 if(name=='exSoldier'){
                                     $("#exSoldierId").val(data.newValue);
@@ -319,7 +323,7 @@
             var this_upload_div_1 =
                 '<div id="this_upload_div_'+ index + '" style="position:relative;">'+
                 '<img  id="this_upload_image_' + index + '" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button('+index+')"/>'+
-                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="this_upload_files"  onchange="this_upload_show_image('+index+ ')" /><br>'+
+                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image('+index+ ')" /><br>'+
                 '</div>';
             $("#this_upload_image_div_"+ index).html("").append(this_upload_div_1);
         }
@@ -407,9 +411,14 @@
                                     <div id="this_upload_div_1" style="position:relative;">
                                         <c:choose>
                                             <c:when test="${not empty workStaffBasicInfo.picture}">
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}?x-oss-process=image/resize,w_150,limit_0"/>
+                                                <span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}"/>
                                             </c:when>
+                                            <c:otherwise>
+                                                <img alt="_blank" id="this_upload_image_1" name="pictureFile" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"/>
+                                            </c:otherwise>
                                         </c:choose>
+                                        <input id="picture" type="text" name="picture" style="display: none" class="basicInfo">
                                         <input id="this_upload_file_1" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image(1)"  class="form-control"/>
                                     </div>
                                 </div>

src/main/webapp/webpage/modules/workstaff/workStaffBasicDetailForm.jsp

@@ -94,7 +94,7 @@
             var this_upload_div_1 =
                 '<div id="this_upload_div_'+ index + '" style="position:relative;">'+
                 '<img  id="this_upload_image_' + index + '" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button('+index+')"/>'+
-                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="this_upload_files"  onchange="this_upload_show_image('+index+ ')" /><br>'+
+                '<input id="this_upload_file_'+ index + '" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image('+index+ ')" /><br>'+
                 '</div>';
             $("#this_upload_image_div_"+ index).html("").append(this_upload_div_1);
         }
@@ -269,13 +269,13 @@
                                         <c:choose>
                                             <c:when test="${not empty workStaffBasicInfo.picture}">
                                                 <span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}?x-oss-process=image/resize,w_150,limit_0" onclick="this_upload_image_button(1)"/>
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}"  onclick="this_upload_image_button(1)"/>
                                             </c:when>
                                             <c:otherwise>
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png" onclick="this_upload_image_button(1)"/>
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png"  onclick="this_upload_image_button(1)"/>
                                             </c:otherwise>
                                         </c:choose>
-                                        <input id="this_upload_file_1" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image(1)"  class="form-control"/>
+                                        <input id="this_upload_file_1" type="file" style="display:none"  name="pictureFile"  onchange="this_upload_show_image(1)"  class="form-control required"/>
                                     </div>
                                 </div>
                             </div>

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoForm.jsp

@@ -28,6 +28,7 @@
                 if(!existMobile){
                     var  flag = $("#updateFlag").val();
                     if(flag === '1'){
+                        // $("#notifyFlag").val("1");
                         $("#inputForm").submit();
                         parent.layer.closeAll();
                     }else {

src/main/webapp/webpage/modules/workstaff/workStaffBasicInfoView.jsp

@@ -102,7 +102,7 @@
                                         <c:choose>
                                             <c:when test="${not empty workStaffBasicInfo.picture}">
                                                 <%--<span id="this_upload_close_1" class="pic_close glyphicon glyphicon-remove" onclick="this_close_img(1)"></span>--%>
-                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}?x-oss-process=image/resize,w_150,limit_0" />
+                                                <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${workStaffBasicInfo.picture}" />
                                             </c:when>
                                             <c:otherwise>
                                                 <img alt="_blank" id="this_upload_image_1" class="upload_ico" style="cursor:pointer;"  src="${pageContext.request.contextPath}/static/common/img/pic_add.png" />