From 40a0ca3db813d4860bc622075c9eba3c3adf334c Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 10 Jul 2025 17:59:06 +0800 Subject: [PATCH] =?UTF-8?q?bug=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../evaluate/beans/TeamGroupBean.java | 1 + .../controller/TeamGroupController.java | 15 +++++++- .../service/OrganizationalServiceImpl.java | 2 +- .../OutsourcerEvaluateServiceImpl.java | 35 +++++++++++++++++-- .../mappers/evaluate/OrganizationalMapper.xml | 3 +- .../evaluate/OutsourcerEvaluateMapper.xml | 2 +- .../mappers/evaluate/TeamGroupMapper.xml | 1 + .../static/js/evaluate/person/person.js | 6 ++-- .../js/evaluate/teamGroup/teamGroupList.js | 5 +-- 9 files changed, 60 insertions(+), 10 deletions(-) diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java index 5b9ca52..90391f2 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/beans/TeamGroupBean.java @@ -38,5 +38,6 @@ public class TeamGroupBean { private String faceUrl; private String isTeamLeader; private Integer teamId; + private Integer userId; } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java index 0c06c7b..1bfdb81 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/controller/TeamGroupController.java @@ -72,6 +72,19 @@ public class TeamGroupController extends BaseController { return ar; } + @PostMapping("updaTeteamGroup") + public AjaxRes updaTeteamGroup(@RequestBody TeamGroupBean teamGroupBean) { + AjaxRes ar = new AjaxRes(); + try { + teamGroupService.updaTeteamGroup(teamGroupBean); + ar.setSucceedMsg("修改成功"); + return ar; + } catch (Exception e) { + ar.setFailMsg(GlobalConst.DATA_FAIL); + } + return ar; + } + // 获取班组人员 @GetMapping("getTeamGroupPerson") public AjaxRes getTeamGroupPerson(TeamGroupBean teamGroupBean) { @@ -213,7 +226,7 @@ public class TeamGroupController extends BaseController { @RequestMapping(value = "importTeamPerson", method = RequestMethod.POST) @ResponseBody public AjaxRes importTeamPerson(@RequestParam String id, @RequestParam("file") MultipartFile file) { - return teamGroupService.importTeamPerson(id,file); + return teamGroupService.importTeamPerson(id, file); } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java index b4bf237..dea6041 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OrganizationalServiceImpl.java @@ -137,7 +137,7 @@ public class OrganizationalServiceImpl implements OrganizationalService { } else if (bean.getLevel() == 3) { int count = projectDao.getProIsExistByDepartmentId(bean); if (count > 0) { - ar.setFailMsg("该项目在该事业部下已存在"); + ar.setFailMsg("该项目在此事业部下已存在"); return ar; } } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java index 41aa082..8874c50 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/OutsourcerEvaluateServiceImpl.java @@ -479,7 +479,9 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService BeanUtils.copyProperties(o, childBean); childBean.setJsonData(list.get(i).toString()); childBean.setDeptId(deptId); - childBean.setUserId(userId); + if (!checkMapValuesAllEmpty(list.get(i))){ + childBean.setUserId(userId); + } childBean.setParentId(o.getId()); childBean.setProId(list.get(i).get("proId").toString()); childBean.setProName(list.get(i).get("proName").toString()); @@ -499,7 +501,9 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService detailsBean.setEvaluateId(o.getEvaluateId()); detailsBean.setTemplateId(o.getTemplateId()); detailsBean.setDeptId(deptId); - detailsBean.setUserId(userId); + if (!checkMapValuesAllEmpty(map)){ + detailsBean.setUserId(userId); + } detailsBean.setParentId(o.getId()); detailsBean.setProId(map.get("proId").toString()); detailsBean.setProName(map.get("proName").toString()); @@ -526,6 +530,33 @@ public class OutsourcerEvaluateServiceImpl implements OutsourcerEvaluateService return ar; } + public static boolean checkMapValuesAllEmpty(Map map) { + if (map == null || map.isEmpty()) { + return true; // 空map认为所有值都是空 + } + + for (Object value : map.values()) { + if (value == null) { + continue; // null 是空值，继续检查下一个 + } + + if (value instanceof String) { + String strVal = (String) value; + if (!strVal.trim().isEmpty()) { + return false; // 发现非空字符串，立即返回 false + } + } else if (value instanceof Boolean) { + return false; // boolean 类型（true/false），不为空 + } else if (value instanceof Number) { + return false; // 数字类型（0 也是有效值） + } else { + // 其他对象只要不为null就认为是非空 + return false; + } + } + + return true; // 所有值都为空 + } @Override public AjaxRes getAuditBtn(EvaluateDataBean o) { AjaxRes ar = new AjaxRes(); diff --git a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml index 7339feb..0aea875 100644 --- a/src/main/resources/mappers/evaluate/OrganizationalMapper.xml +++ b/src/main/resources/mappers/evaluate/OrganizationalMapper.xml @@ -170,7 +170,7 @@ org_type orgType FROM pm_org_info WHERE status = 1 - AND level in (1, 2) +-- AND level in (1, 2) diff --git a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml index d6615ac..b5e2001 100644 --- a/src/main/resources/mappers/evaluate/TeamGroupMapper.xml +++ b/src/main/resources/mappers/evaluate/TeamGroupMapper.xml @@ -43,6 +43,7 @@ SELECT poi2.NAME subContractor, poi3.NAME project, + poi3.user_id as userId, poi.NAME teamGroupName, poi.id as id, poi.status as status, diff --git a/src/main/resources/static/js/evaluate/person/person.js b/src/main/resources/static/js/evaluate/person/person.js index 2578365..ff5e721 100644 --- a/src/main/resources/static/js/evaluate/person/person.js +++ b/src/main/resources/static/js/evaluate/person/person.js @@ -101,8 +101,10 @@ function initTreeTable() { let html = ""; html += '修改'; - html += - '删除'; + if (d.roleName !== "项目经理"){ + html += + '删除'; + } return html; }, }, diff --git a/src/main/resources/static/js/evaluate/teamGroup/teamGroupList.js b/src/main/resources/static/js/evaluate/teamGroup/teamGroupList.js index 80954d0..f56857e 100644 --- a/src/main/resources/static/js/evaluate/teamGroup/teamGroupList.js +++ b/src/main/resources/static/js/evaluate/teamGroup/teamGroupList.js @@ -1,11 +1,12 @@ // 专责审批 js文件 -let layer, laydate, table, form; +let layer, laydate, table, form, loginUser; $(function () { layui.use(["layer", "laydate", "table", "form"], function () { layer = layui.layer; laydate = layui.laydate; form = layui.form; table = layui.table; + loginUser = JSON.parse(localStorage.getItem("loginUser")); laydate.render({ elem: "#startDate", type: "month", @@ -135,7 +136,7 @@ function initTable() { '删除'; - if (d.status == 1) { + if (d.status == 1 && loginUser.id === d.userId) { text += '