From fadbe2b59ff7ca50f48c0b8a946a4d396fe42dae Mon Sep 17 00:00:00 2001 From: Timer <@> Date: Wed, 1 Apr 2026 08:58:11 +0800 Subject: [PATCH] bug --- .../maintenance/EquipmentPlanController.java | 18 ++++++------------ .../pipeline/PipelineDataController.java | 4 +++- .../user/ProcessSectionController.java | 11 ++++++----- .../sipai/controller/user/UserController.java | 6 +++++- .../webapp/jsp/pipeline/pipelineDataList.jsp | 5 ++++- .../webapp/jsp/safety/SafetyJobInsideAdd.jsp | 3 ++- .../webapp/jsp/safety/SafetyJobInsideSign.jsp | 11 +++++++++-- .../webapp/jsp/user/userForSelectByCompany.jsp | 7 ++++++- 8 files changed, 41 insertions(+), 24 deletions(-) diff --git a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java index 9600724c..34c9f5cb 100644 --- a/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java +++ b/src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java @@ -279,10 +279,8 @@ public class EquipmentPlanController { if (company != null) { model.addAttribute("companyName", company.getSname()); } - User user = userService.getUserById(equipmentPlan.getAuditId()); - if (user != null) { - model.addAttribute("userName", user.getCaption()); - } + String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId()); + model.addAttribute("userName", userNames); EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig()); if (equipmentPlanType_big != null) { model.addAttribute("planTypeBigName", equipmentPlanType_big.getName()); @@ -308,10 +306,8 @@ public class EquipmentPlanController { if (company != null) { model.addAttribute("companyName", company.getSname()); } - User user = userService.getUserById(equipmentPlan.getAuditId()); - if (user != null) { - model.addAttribute("userName", user.getCaption()); - } + String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId()); + model.addAttribute("userName", userNames); EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig()); if (equipmentPlanType_big != null) { model.addAttribute("planTypeBigName", equipmentPlanType_big.getName()); @@ -422,10 +418,8 @@ public class EquipmentPlanController { if (company != null) { model.addAttribute("companyName", company.getSname()); } - User user = userService.getUserById(equipmentPlan.getAuditId()); - if (user != null) { - model.addAttribute("userName", user.getCaption()); - } + String userNames = userService.getUserNamesByUserIds(equipmentPlan.getAuditId()); + model.addAttribute("userName", userNames); EquipmentPlanType equipmentPlanType_big = equipmentPlanTypeService.selectById(equipmentPlan.getPlanTypeBig()); if (equipmentPlanType_big != null) { model.addAttribute("planTypeBigName", equipmentPlanType_big.getName()); diff --git a/src/main/java/com/sipai/controller/pipeline/PipelineDataController.java b/src/main/java/com/sipai/controller/pipeline/PipelineDataController.java index a9434ab6..53609c85 100644 --- a/src/main/java/com/sipai/controller/pipeline/PipelineDataController.java +++ b/src/main/java/com/sipai/controller/pipeline/PipelineDataController.java @@ -123,7 +123,9 @@ public class PipelineDataController { @RequestMapping("/deletes.do") public String dodeletes(HttpServletRequest request, Model model, @RequestParam(value = "ids") String ids) { - int result = this.pipelineDataService.deleteByWhere("where id in (" + ids + ")"); + // 移除末尾逗号，防止SQL语法错误 + String cleanIds = ids.replaceAll("[,\\s]+$", "").replaceAll("^[,\\s]+", ""); + int result = this.pipelineDataService.deleteByWhere("where id in (" + cleanIds + ")"); model.addAttribute("result", result); return "result"; } diff --git a/src/main/java/com/sipai/controller/user/ProcessSectionController.java b/src/main/java/com/sipai/controller/user/ProcessSectionController.java index 5aad3455..ee570fbc 100644 --- a/src/main/java/com/sipai/controller/user/ProcessSectionController.java +++ b/src/main/java/com/sipai/controller/user/ProcessSectionController.java @@ -242,10 +242,11 @@ public class ProcessSectionController { @RequestMapping("/getProcessSection4Select.do") public String getProcessSection4Select(HttpServletRequest request, Model model) { String companyId = request.getParameter("companyId"); // 默认查询JSBZ??? - Company company = this.companyService.selectByPrimaryKey(companyId); + // 使用unitService获取Unit信息，因为companyId来自tb_unit表 + Unit unit = this.unitService.getUnitById(companyId); String wherestr = "where 1=1 and active='" + CommString.Active_True + "' "; - if (company != null && company.getType().equals(CommString.UNIT_TYPE_COMPANY)) { // "C";//公司 + if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_COMPANY)) { // "C";//公司 String bizs = "";//公司下属所有厂id List blist = this.unitService.getParentCompanyChildrenBizByUnitid(companyId); if (blist != null && blist.size() > 0) { @@ -257,7 +258,7 @@ public class ProcessSectionController { } bizs = bizs.replace(",", "','"); wherestr += " and (unit_id='" + ProcessSection.UnitId_Sys + "' or (code not in (select code from tb_process_section where unit_id='" + ProcessSection.UnitId_Sys + "')) and unit_id in ('" + bizs + "') ) "; - } else if (company != null && company.getType().equals(CommString.UNIT_TYPE_BIZ)) { // B 水厂 + } else if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_BIZ)) { // B 水厂 wherestr += " and unit_id='" + companyId + "' "; } if (request.getParameter("search_name") != null && !request.getParameter("search_name").isEmpty()) { @@ -272,13 +273,13 @@ public class ProcessSectionController { for (int i = 0; i < processSections.size(); i++) { JSONObject jsonObject = new JSONObject(); jsonObject.put("id", processSections.get(i).getCode()); - if (company != null && company.getType().equals(CommString.UNIT_TYPE_COMPANY)) { // "C";//公司 + if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_COMPANY)) { // "C";//公司 if (!processSections.get(i).getUnitId().equals(ProcessSection.UnitId_Sys)) { jsonObject.put("text", processSections.get(i).getSname() + "(" + processSections.get(i).getCompanySname() + ")"); } else { jsonObject.put("text", processSections.get(i).getSname()); } - } else if (company != null && company.getType().equals(CommString.UNIT_TYPE_BIZ)) { // "B";//水厂 + } else if (unit != null && unit.getType().equals(CommString.UNIT_TYPE_BIZ)) { // "B";//水厂 jsonObject.put("text", processSections.get(i).getSname()); } diff --git a/src/main/java/com/sipai/controller/user/UserController.java b/src/main/java/com/sipai/controller/user/UserController.java index b738062a..48387365 100644 --- a/src/main/java/com/sipai/controller/user/UserController.java +++ b/src/main/java/com/sipai/controller/user/UserController.java @@ -852,11 +852,13 @@ public class UserController { public String userForSelectByCompany(HttpServletRequest request, Model model) { String userIds = request.getParameter("userIds"); String jobIds = request.getParameter("jobIds"); + String displayDept = request.getParameter("displayDept"); if (userIds != null && !userIds.isEmpty()) { - List list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')"); + List list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',',','" + userIds + ",')"); model.addAttribute("users", JSONArray.fromObject(list)); } model.addAttribute("jobIds", jobIds); + model.addAttribute("displayDept", displayDept); return "user/userForSelectByCompany"; } @@ -1255,6 +1257,7 @@ public class UserController { model.addAttribute("users", JSONArray.fromObject(list)); } model.addAttribute("jobIds", jobIds); + model.addAttribute("displayDept", request.getParameter("displayDept")); return "user/userForSelectByWorkOrder"; } @@ -1454,6 +1457,7 @@ public class UserController { model.addAttribute("users", JSONArray.fromObject(list)); } model.addAttribute("jobIds", jobIds); + model.addAttribute("displayDept", request.getParameter("displayDept")); return "user/userSelectLayer"; } diff --git a/src/main/webapp/jsp/pipeline/pipelineDataList.jsp b/src/main/webapp/jsp/pipeline/pipelineDataList.jsp index d11016aa..4e2c0cc7 100644 --- a/src/main/webapp/jsp/pipeline/pipelineDataList.jsp +++ b/src/main/webapp/jsp/pipeline/pipelineDataList.jsp @@ -88,7 +88,10 @@ var checkedItems = $("#table").bootstrapTable('getSelections'); var datas = ""; $.each(checkedItems, function(index, item) { - datas += item.id + ","; + if (datas != "") { + datas += ","; + } + datas += item.id; }); if (datas == "") { showAlert('d', '请先选择记录', 'mainAlertdiv'); diff --git a/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp b/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp index 0ca1f89a..c856070e 100644 --- a/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp +++ b/src/main/webapp/jsp/safety/SafetyJobInsideAdd.jsp @@ -234,7 +234,8 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD { formId: "addForm", hiddenId: "userId", - textId: "userName" + textId: "userName", + displayDept: "true" }, function (data) { $("#user4SelectDiv").html(data); openModal("user4SelectModal"); diff --git a/src/main/webapp/jsp/safety/SafetyJobInsideSign.jsp b/src/main/webapp/jsp/safety/SafetyJobInsideSign.jsp index 9d53bb8a..7b82e216 100644 --- a/src/main/webapp/jsp/safety/SafetyJobInsideSign.jsp +++ b/src/main/webapp/jsp/safety/SafetyJobInsideSign.jsp @@ -47,6 +47,11 @@ PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD display: inline-block; vertical-align: top; padding: 8px; + width: 140px; + text-align: left; + } + .detail-row { + clear: both; }