地区负责人校验及新增调整

src/main/java/com/jeeplus/modules/areaStaff/web/AreaStaffController.java

@@ -428,27 +428,35 @@ public class AreaStaffController extends BaseController {
 
         StringBuilder msg = new StringBuilder();
         int newNum = 0;
-        for (int i = 0; i < idsArr.length; i++) {
-            User user = systemService.getUser(idsArr[i]);
-            //将人员信息进行添加到对应数据节点下（需先验证是否存在重复值）
-            for (String info : infos) {
-                String substring = info.substring(0, info.lastIndexOf(":"));
-                if (substring.equals(idsArr[i])){
-                    String template=info.substring(info.lastIndexOf(":")+1);
-                    areaStaffInfo.setIsTemplate(template);
+        if (infos.size()!=0){
+            for (int i = 0; i < idsArr.length; i++) {
+                User user = systemService.getUser(idsArr[i]);
+                //将人员信息进行添加到对应数据节点下（需先验证是否存在重复值）
+                for (String info : infos) {
+                    String substring = info.substring(0, info.lastIndexOf(":"));
+                    if (substring.equals(idsArr[i])){
+                        String template=info.substring(info.lastIndexOf(":")+1);
+                        areaStaffInfo.setIsTemplate(template);
+                    }
+                    continue;
                 }
-                continue;
-            }
-            User saveUser = areaStaffService.saveUser(areaStaffInfo, user);
+                User saveUser = areaStaffService.saveUser(areaStaffInfo, user);
 
-            if (null != saveUser && StringUtils.isNotBlank(saveUser.getId()) && !saveUser.getId().equals("1")) {
-                msg.append(",新增用户【" + saveUser.getName() + "】成功！");
-                newNum++;
-            }else if(null == saveUser || StringUtils.isBlank(saveUser.getId())) {
-                msg.append(",新增用户【" + user.getName() + "】失败！");
+                if (null != saveUser && StringUtils.isNotBlank(saveUser.getId()) && !saveUser.getId().equals("1")) {
+                    msg.append(",新增用户【" + saveUser.getName() + "】成功！");
+                    newNum++;
+                }else if(null == saveUser || StringUtils.isBlank(saveUser.getId())) {
+                    msg.append(",新增用户【" + user.getName() + "】失败！");
+                }
+            }
+            addMessage(redirectAttributes, "已成功分配 "+newNum+" 个用户"+msg);
+        }else {
+            //获取该地区下所有用户,将他们删除
+            List<User> userList = areaStaffService.getUserByParentId(areaStaffInfo);
+            for (User user : userList) {
+                areaStaffService.outUserById(user.getId(),user.getAuditUserId());
             }
         }
-        addMessage(redirectAttributes, "已成功分配 "+newNum+" 个用户"+msg);
         return "redirect:" + adminPath + "/areaStaff/areaStaff/userForm?parent.id="+areaStaffInfo.getId();
     }
 

src/main/webapp/webpage/modules/areaStaff/areaStaffUserForm.jsp

@@ -21,17 +21,17 @@
 			  let allSelected = true;
 			  //获取表格中的数据
 			  var tableRows = document.querySelectorAll('table.details tbody tr');
-			  tableRows.forEach(function(row) {
-				  var selectElement = row.querySelector('select[name="isTemplate"]'); // 下拉框的name属性是"isTemplate"
-				  var userNameElement = row.querySelector('td[data-id="userName"]');
+			  for (let i = 0; i < tableRows.length; i++) {
+				  var selectElement = tableRows[i].querySelector('select[name="isTemplate"]'); // 下拉框的name属性是"isTemplate"
+				  var userNameElement = tableRows[i].querySelector('td[data-id="userName"]');
 				  var userName = userNameElement ? userNameElement.innerText.trim() : null;
 
 				  if (!selectElement || !selectElement.value) {
-					  top.layer.alert(userName+':未选择长期还是临时', {icon: 0});
+					  layer.msg(userName+':未选择长期还是临时', {icon: 0});
 					  allSelected = false;
-					  return;
 				  }
-			  })
+				  return;
+			  }
 			  if(allSelected){
 				  $("#inputForm").submit();
 				  $('#assignRoleForm').submit();