From 50492b9fe2b558296bb7cba9cb5561615875e95a Mon Sep 17 00:00:00 2001 From: "liang.chao" <1360241448@qq.com> Date: Thu, 10 Jul 2025 09:53: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 --- .../gs/sub/evaluate/evaluate/dao/PersonDao.java | 2 ++ .../gs/sub/evaluate/evaluate/dao/ProjectDao.java | 2 ++ .../service/OrganizationalServiceImpl.java | 14 +++++++++----- .../evaluate/service/PersonServiceImpl.java | 16 ++++++++++++++-- .../resources/mappers/evaluate/PersonMapper.xml | 5 +++++ .../resources/mappers/evaluate/ProjectMapper.xml | 11 +++++++++++ .../static/js/evaluate/person/person.js | 2 +- src/main/resources/static/js/filePreview.js | 4 ++-- .../static/pages/evaluate/person/editPerson.html | 2 +- 9 files changed, 47 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/PersonDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/PersonDao.java index cb47402..83e7126 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/PersonDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/PersonDao.java @@ -55,4 +55,6 @@ public interface PersonDao { int deletePersonById(String id); void updateOldUser(@Param("list")List list); + + Integer getPerSonByPhone(PersonBean o); } diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java index 4966ba1..66e1047 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/dao/ProjectDao.java @@ -33,4 +33,6 @@ public interface ProjectDao { int getProjectByName(ProjectBean projectBean); Integer getTeamGroup(ProjectBean bean); + + int getProIsExistByDepartmentId(OrganizationalBean bean); } 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 7794a70..b4bf237 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 @@ -4,6 +4,7 @@ import com.bonus.gs.sub.evaluate.evaluate.beans.OrganizationalBean; import com.bonus.gs.sub.evaluate.evaluate.beans.TeamEvaluateBean; import com.bonus.gs.sub.evaluate.evaluate.controller.OrganizationalController; import com.bonus.gs.sub.evaluate.evaluate.dao.OrganizationalDao; +import com.bonus.gs.sub.evaluate.evaluate.dao.ProjectDao; import com.bonus.gs.sub.evaluate.manager.utils.AjaxRes; import com.bonus.gs.sub.evaluate.manager.utils.CipherHelper; import com.bonus.gs.sub.evaluate.manager.utils.StringHelper; @@ -29,6 +30,8 @@ public class OrganizationalServiceImpl implements OrganizationalService { private static final Logger logger = Logger.getLogger(String.valueOf(OrganizationalController.class)); @Autowired private OrganizationalDao mapper; + @Autowired + private ProjectDao projectDao; public static String DEFEAT_P_ID = "0"; /** @@ -125,17 +128,18 @@ public class OrganizationalServiceImpl implements OrganizationalService { ar.setFailMsg("该班组名称已存在"); return ar; } -// String pwrs = "gsks@123";// 随机密码,以后发邮箱 -// String pwrsMD5 = CipherHelper.generatePassword(pwrs);// 第一次加密md5， -// String salt = CipherHelper.createSalt(); -// bean.setSalt(salt); -// bean.setPassword(pwrsMD5); } else if (bean.getLevel() == 4) { int count = mapper.getConsIsExistByPro(bean); if (count > 0) { ar.setFailMsg("该承包商在此项目下已存在"); return ar; } + } else if (bean.getLevel() == 3) { + int count = projectDao.getProIsExistByDepartmentId(bean); + if (count > 0) { + ar.setFailMsg("该项目在该事业部下已存在"); + return ar; + } } int num = mapper.addData(bean); if (num > 0) { diff --git a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/PersonServiceImpl.java b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/PersonServiceImpl.java index 7ab0c0a..0b0504b 100644 --- a/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/PersonServiceImpl.java +++ b/src/main/java/com/bonus/gs/sub/evaluate/evaluate/service/PersonServiceImpl.java @@ -51,13 +51,19 @@ public class PersonServiceImpl implements PersonService { personBean.setDeptId(StringUtils.isBlank(personBean.getDeptId()) ? "0" : personBean.getDeptId()); }); for (PersonBean personBean : list) { - dao.addPersonInfo(personBean); + Integer num = dao.getPerSonByPhone(personBean); + if (num > 0) { + ar.setFailMsg("该手机号已存在"); + return ar; + } else { + dao.addPersonInfo(personBean); + } } dao.addPersonRole(list); dao.updateOldUser(list); ar.setSucceed(GlobalConst.SAVE_SUCCEED); } catch (Exception e) { - log.error(e.toString(),e); + log.error(e.toString(), e); TransactionAspectSupport.currentTransactionStatus().setRollbackOnly(); ar.setFailMsg("添加失败"); } @@ -69,6 +75,12 @@ public class PersonServiceImpl implements PersonService { public AjaxRes updatePerson(PersonBean o) { AjaxRes ar = new AjaxRes(); try { + // 先查询该人员手机号是否有重复 + Integer count = dao.getPerSonByPhone(o); + if (count > 0) { + ar.setFailMsg("该手机号已存在"); + return ar; + } o.setDeptId(StringUtils.isBlank(o.getDeptId()) ? "0" : o.getDeptId()); dao.deletePersonRole(o.getId()); dao.updatePerson(o); diff --git a/src/main/resources/mappers/evaluate/PersonMapper.xml b/src/main/resources/mappers/evaluate/PersonMapper.xml index 567febd..d607493 100644 --- a/src/main/resources/mappers/evaluate/PersonMapper.xml +++ b/src/main/resources/mappers/evaluate/PersonMapper.xml @@ -155,4 +155,9 @@ ) + diff --git a/src/main/resources/mappers/evaluate/ProjectMapper.xml b/src/main/resources/mappers/evaluate/ProjectMapper.xml index ff1d80c..4d2ddb5 100644 --- a/src/main/resources/mappers/evaluate/ProjectMapper.xml +++ b/src/main/resources/mappers/evaluate/ProjectMapper.xml @@ -130,4 +130,15 @@ poi.STATUS = 1 AND poi3.id = #{id} + diff --git a/src/main/resources/static/js/evaluate/person/person.js b/src/main/resources/static/js/evaluate/person/person.js index c76c1d5..2578365 100644 --- a/src/main/resources/static/js/evaluate/person/person.js +++ b/src/main/resources/static/js/evaluate/person/person.js @@ -174,7 +174,7 @@ function add() { layer.open({ type: 2, - title: "新增企业", + title: "新增人员", content: "./EvaluatePersonAdd.html?id=0", btn: ["确定"], maxmin: false, diff --git a/src/main/resources/static/js/filePreview.js b/src/main/resources/static/js/filePreview.js index b49130e..a7cebd4 100644 --- a/src/main/resources/static/js/filePreview.js +++ b/src/main/resources/static/js/filePreview.js @@ -92,14 +92,14 @@ var Base64 = { // var filePreviewPath = "http://36.33.26.201:21624/GsSubEvaluate/statics/"; var filePreviewPath = "http://192.168.0.14:1803/GsSubEvaluate/statics/"; // 测试环境 -// var filePreviewPath = "http://112.29.103.165:1618/GsSubEvaluate/statics/"; // 生产环境 +// var filePreviewPath = "http://192.168.1.3:1803/GsSubEvaluate/statics/"; // 生产环境 // var filePreviewPath = "http://127.0.0.1:1803/GsSubEvaluate/statics/"; // var filePreviewPath = "http://192.168.0.2:1803/GsSubEvaluate/statics/"; var filePreviewPathAll = "http://192.168.0.14:8012/onlinePreview?url="; // 测试环境 -// var filePreviewPathAll = "http://112.29.103.165:8012/onlinePreview?url="; // 生产环境 +// var filePreviewPathAll = "http://192.168.1.3:8012/onlinePreview?url="; // 生产环境 function filePreview(url) { let path; diff --git a/src/main/resources/static/pages/evaluate/person/editPerson.html b/src/main/resources/static/pages/evaluate/person/editPerson.html index 7326a6a..11694a6 100644 --- a/src/main/resources/static/pages/evaluate/person/editPerson.html +++ b/src/main/resources/static/pages/evaluate/person/editPerson.html @@ -198,7 +198,7 @@ layer.msg('修改成功', {icon: 1}); closePage(); } else { - layer.msg(data.msg, {icon: 2}); + layer.msg(data.resMsg, {icon: 2}); } } });