Merge remote-tracking branch 'origin/master'

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

@@ -123,6 +123,9 @@ public class WorkStaffBasicInfoController extends BaseController {
 		    workStaffBasicInfo.setNation(DictUtils.getDictValue("汉族","nation_type",""));
         }
         workStaffBasicInfo.setRoleId(roleService.getRoleIdByUserId(workStaffBasicInfo.getUserId()));
+		if(StringUtils.isNotBlank(workStaffBasicInfo.getId())){
+			model.addAttribute("updateFlag","1");
+		}
         model.addAttribute("workStaffBasicInfo", workStaffBasicInfo);
         String view = "modules/workstaff/workStaffBasicInfoForm";
         if(UserUtils.getUser().getId().equals(workStaffBasicInfo.getUserId())){

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

@@ -36,14 +36,19 @@
                 //     parent.layer.close(index);
                 //     setTimeout(function(){top.layer.close(index1)}, 100);
                 // });
-                parent.layer.alert('该成员将收到信息完善待办。',
-
-                    function(index){
-                        $("#notifyFlag").val("1");
-                        $("#inputForm").submit();
-                        parent.layer.closeAll();
-                        // setTimeout(function(){top.layer.close(index1)}, 100);
-                    });
+                var flag = $("#updateFlag").val();
+                if(flag === '1'){
+                    $("#inputForm").submit();
+                    parent.layer.closeAll();
+                }else {
+                    parent.layer.alert('该成员将收到信息完善待办。',
+                        function (index) {
+                            $("#notifyFlag").val("1");
+                            $("#inputForm").submit();
+                            parent.layer.closeAll();
+                            // setTimeout(function(){top.layer.close(index1)}, 100);
+                        });
+                }
                 return false;
             }
 
@@ -328,6 +333,7 @@
             <form:hidden path="id"/>
             <form:hidden path="notifyFlag"/>
             <form:hidden path="userId"/>
+            <input id="updateFlag" value="${updateFlag}" style="display:none;">
             <div class="form-group layui-row first">
                 <div class="form-group-label"><h2>基本信息</h2></div>
                 <div class="layui-item layui-col-sm6 lw7" style="padding-right: 0;">