From 4eef0d14c1945856b41beaa33a1ed2c46aba78fb Mon Sep 17 00:00:00 2001 From: masong Date: Fri, 17 Mar 2023 11:40:06 +0800 Subject: [PATCH] =?UTF-8?q?=E8=B0=83=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../controller/EnterpriseInfoController.java | 12 ++++++++++-- .../cjy/enterprise/mapper/EnterpriseInfoMapper.java | 8 ++++++++ .../service/impl/EnterpriseInfoServiceImpl.java | 5 +++++ .../mapper/enterprise/EnterpriseInfoMapper.xml | 3 +++ .../main/resources/mapper/system/SysDeptMapper.xml | 2 +- .../main/resources/mapper/system/SysRoleMapper.xml | 2 +- .../main/resources/mapper/system/SysUserMapper.xml | 2 +- 7 files changed, 29 insertions(+), 5 deletions(-) diff --git a/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java b/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java index 3bb9546e..4a2bf30a 100644 --- a/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java +++ b/cjy-project/src/main/java/com/cjy/enterprise/controller/EnterpriseInfoController.java @@ -88,9 +88,17 @@ public class EnterpriseInfoController extends BaseController { enterpriseInfo.setOrganCode(SnowflakeIdUtils.generateIdentification()); String configValue = sysConfigService.selectConfigByKey("web_site"); enterpriseInfo.setWebsiteUrl(configValue + "&organCode=" + enterpriseInfo.getOrganCode()); - enterpriseInfo.setStatus(1); + enterpriseInfo.setStatus(0); enterpriseInfo.setDelFlag(0); - return toAjax(enterpriseInfoService.insertEnterpriseInfo(enterpriseInfo)); + int result = enterpriseInfoService.insertEnterpriseInfo(enterpriseInfo); + if(result>0){ + return toAjax(result); + }else if(result == -2){ + return AjaxResult.error("机构名称已存在"); + }else{ + return toAjax(result); + } + } /** diff --git a/cjy-project/src/main/java/com/cjy/enterprise/mapper/EnterpriseInfoMapper.java b/cjy-project/src/main/java/com/cjy/enterprise/mapper/EnterpriseInfoMapper.java index 44b2b0aa..a8993495 100644 --- a/cjy-project/src/main/java/com/cjy/enterprise/mapper/EnterpriseInfoMapper.java +++ b/cjy-project/src/main/java/com/cjy/enterprise/mapper/EnterpriseInfoMapper.java @@ -3,6 +3,7 @@ package com.cjy.enterprise.mapper; import java.util.List; import com.cjy.enterprise.domain.EnterpriseInfo; import com.cjy.enterprise.domain.vo.EnterpriseInfoExtend; +import org.apache.ibatis.annotations.Param; /** * 企业信息Mapper接口 @@ -69,4 +70,11 @@ public interface EnterpriseInfoMapper * @return */ public int updateFlagListByIds(Long[] ids); + + /** + * 查询项目名称是否存在 + * @param name + * @return + */ + public int selectEnterpriseByOrganName(@Param("name") String name); } diff --git a/cjy-project/src/main/java/com/cjy/enterprise/service/impl/EnterpriseInfoServiceImpl.java b/cjy-project/src/main/java/com/cjy/enterprise/service/impl/EnterpriseInfoServiceImpl.java index bf6c0324..ca40bf29 100644 --- a/cjy-project/src/main/java/com/cjy/enterprise/service/impl/EnterpriseInfoServiceImpl.java +++ b/cjy-project/src/main/java/com/cjy/enterprise/service/impl/EnterpriseInfoServiceImpl.java @@ -80,6 +80,11 @@ public class EnterpriseInfoServiceImpl implements IEnterpriseInfoService { */ @Override public int insertEnterpriseInfo(EnterpriseInfo enterpriseInfo) { + //0. 查询名称是否已存在 + boolean isOk = enterpriseInfoMapper.selectEnterpriseByOrganName(enterpriseInfo.getOrganName())>0; + if(isOk){ + return -2; + } //1. 创建单位 Long deptId = insertOrganDept(enterpriseInfo); //2. 创建人员 diff --git a/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml b/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml index 6da2e00a..5095e3b1 100644 --- a/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml +++ b/cjy-project/src/main/resources/mapper/enterprise/EnterpriseInfoMapper.xml @@ -95,6 +95,9 @@ where id = #{id} + insert into ti_enterprise_info diff --git a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml index a8156b70..cd081975 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysDeptMapper.xml @@ -90,7 +90,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where dept_name=#{deptName} and parent_id = #{parentId} and del_flag = '0' limit 1 - where organ_code=#{organCode} and del_flag != '2' diff --git a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml index c451c3cf..9b37f602 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysRoleMapper.xml @@ -93,7 +93,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" where r.role_key=#{roleKey} and r.del_flag = '0' limit 1 - select r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.menu_check_strictly, r.dept_check_strictly, r.status, r.del_flag, r.create_time, r.remark,r.organ_code from sys_role r where r.organ_code=#{organCode} and r.del_flag ="0" diff --git a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml index 86d6a4c3..1a18f989 100644 --- a/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml +++ b/ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml @@ -146,7 +146,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" - select u.user_id, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.organ_code from sys_user u where u.organ_code =#{organCode} and u.del_flag !='2'