xzzn/SIPAIIS_WMS_JSSW
4
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

bug

Browse Source
This commit is contained in:
Timer
2026-04-01 08:58:11 +08:00
parent f33f57f6a7
commit fadbe2b59f
8 changed files with 41 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
src/main/java/com/sipai/controller/maintenance/EquipmentPlanController.java
View File

@ -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());

4
src/main/java/com/sipai/controller/pipeline/PipelineDataController.java
View File

@ -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";
}

11
src/main/java/com/sipai/controller/user/ProcessSectionController.java
View File

@ -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<Unit> 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());
}

6
src/main/java/com/sipai/controller/user/UserController.java
View File

@ -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<User> list = this.userService.selectListByWhere("where id in ('" + userIds.replace(",", "','") + "') order by CHARINDEX(','+ id +',','," + userIds + ",')");
List<User> 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";
}