人员三级校审人员选择优化

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

@@ -248,6 +248,10 @@ public class WorkStaffBasicInfoService extends CrudService<WorkStaffBasicInfoDao
      */
 	@Transactional(readOnly = false)
 	public Integer updateAuditUser(WorkStaffBasicInfo workStaffBasicInfo) {
+	    //判断  如果全段出过来的人员为0 则赋值为空字符串
+	    /*if("0".equals(workStaffBasicInfo.getAuditUserId())){
+            workStaffBasicInfo.setAuditUserId("");
+        }*/
         Integer result = dao.updateAuditUser(workStaffBasicInfo);
         //同步修改sys_user表中的name
         User user = new User();

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

@@ -312,6 +312,10 @@ public class WorkStaffBasicInfoController extends BaseController {
 	public List<Map<String,Object>> getAuditUserList(){
 		List<Map<String,Object>> mapList = new ArrayList<>();
 		List<User> auditUserList = userService.getAuditUserList();
+		/*Map mapNull = new HashMap();
+		mapNull.put("name","0");
+		mapNull.put("value","");
+		mapList.add(mapNull);*/
 		if(auditUserList.size()>0){
 			for (User user : auditUserList) {
 				Map map = new HashMap();

src/main/resources/mappings/modules/sys/UserDao.xml

@@ -1115,7 +1115,7 @@
 			<if test="office!=null  and office.id != null and office.id != ''">
 				office_id = #{office.id}
 			</if>
-			<if test="auditUserId!=null  and auditUserId != null and auditUserId != ''">
+			<if test="auditUserId!=null">
 				audit_user_id = #{auditUserId}
 			</if>
 		</set>

src/main/webapp/webpage/modules/ruralprojectrecords/cost/ruralCostProjectMessageList.jsp

@@ -340,6 +340,7 @@
 
 						/*归档相关按钮*/
 						if(d.projectReportStatus == 5){
+							xml+="<a href=\"#\" style='background-color: #FFB800' onclick=\"openDialogre('下载报告模板', '${ctx}/ruralProject/ruralProjectMessage/skipDownloadFtl?id=" + d.id +"','35%', '35%','','下载,关闭')\" class=\"op-btn\" > 下载报告模板</a>";
 							if(d.recordAdd != undefined && d.recordAdd =="1")
 							{
 								xml+="<a href=\"#\" onclick=\"openDialogre('新增归档信息', '${ctx}/ruralProject/ruralCostProjectMessage/formRecord?reportId=" + d.id +"','95%', '95%','','送审,暂存,关闭')\" class=\"op-btn layui-bg-green\" ><i class=\"fa fa-plus\"></i> 新增归档信息</a>";

src/main/webapp/webpage/modules/workcontractinfo/workContractInfoList.jsp

@@ -817,7 +817,7 @@
 							<c:when test="${workContractInfo.borrowStatus == '5' && workContractInfo.giveStatus != '5'}">,"giveBorrow":"1"</c:when>
 						</c:choose>
 					</c:if>
-					<c:if test="${'1' == workContractInfo.flagAdmin}">
+					<c:if test="${'1' == workContractInfo.flagAdmin or '1' == workContractInfo.opinion}">
 						<c:choose>
 							<c:when test="${workContractInfo.contractState == 5 }">,"updateAdmin":"1"</c:when>
 						</c:choose>