bonus
/
Bonus-Cloud-Material
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of http://14.103.246.124:16000/bonus/Bonus-Cloud-Material

This commit is contained in:
hongchao 2025-09-17 12:22:55 +08:00
parent d860758ac0 a9c6fb295d
commit 336847c054
3 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/mapper/BmUnitMapper.java
View File

@ -61,10 +61,10 @@ public interface BmUnitMapper
/**
* 根据单位名查询单位信息
* @param unitName
* @param bmUnit
* @return
*/
BmUnit selectBmUnitByProName(String unitName);
BmUnit selectBmUnitByProName(BmUnit bmUnit);
/**
* 根据单位id查询单位人员数量

4
bonus-modules/bonus-material/src/main/java/com/bonus/material/basic/service/impl/BmUnitServiceImpl.java
View File

@ -126,7 +126,7 @@ public class BmUnitServiceImpl implements IBmUnitService
public AjaxResult insertBmUnit(BmUnit bmUnit)
{
//根据单位名称查询去重
BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit.getUnitName());
BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit);
if (unit != null) {
return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg());
}
@ -157,7 +157,7 @@ public class BmUnitServiceImpl implements IBmUnitService
public AjaxResult updateBmUnit(BmUnit bmUnit)
{
//根据单位名称查询去重
BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit.getUnitName());
BmUnit unit = bmUnitMapper.selectBmUnitByProName(bmUnit);
if (unit != null) {
if (!Objects.equals(unit.getUnitId(), bmUnit.getUnitId())) {
return AjaxResult.error(HttpCodeEnum.NAME_DUPLICATE.getCode(), HttpCodeEnum.NAME_DUPLICATE.getMsg());

2
bonus-modules/bonus-material/src/main/resources/mapper/material/basic/BmUnitMapper.xml
View File

@ -40,6 +40,8 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
<select id="selectBmUnitByProName" resultType="com.bonus.material.basic.domain.BmUnit">
select unit_id as unitId, unit_name as unitName from bm_unit where del_flag = 0 and unit_name = #{unitName}
<if test="deptId != null">and dept_id = #{deptId}</if>
<if test="typeId != null">and type_id = #{typeId}</if>
</select>
<select id="countBmUnitPersonByUnitId" resultType="java.lang.Integer">