admin-web/src/views/systemSetting/department/edit.vue
@@ -18,8 +18,8 @@ </el-form-item> <el-form-item label="状态" prop="status"> <el-radio-group v-model="formData.status"> <el-radio :label="0">正常</el-radio> <el-radio :label="1">禁用</el-radio> <el-radio :label="1">正常</el-radio> <el-radio :label="0">禁用</el-radio> </el-radio-group> </el-form-item> <el-form-item label="顺序" prop="orderNum"> @@ -66,7 +66,7 @@ tenantId:'', name:'', code:'', status:0, status:1, orderNum:1 }, rules: { admin-web/src/views/systemSetting/department/index.vue
@@ -138,7 +138,7 @@ align: 'center', width: 100, formatter: (row) => { return { value: row.status === 0 ? '启用' : '禁用' }; return { value: row.status === 1 ? '启用' : '禁用' }; }, }, ], consum-base/src/main/java/com/consum/base/controller/FinSysTenantDepartmentController.java
@@ -1,5 +1,14 @@ package com.consum.base.controller; import java.util.List; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; import com.consum.base.BaseController; import com.consum.base.core.utils.CommonUtil; import com.consum.base.pojo.FinSysTenantDepartmentParam; @@ -9,14 +18,11 @@ import com.walker.db.page.GenericPager; import com.walker.infrastructure.utils.StringUtils; import com.walker.web.ResponseValue; import io.swagger.annotations.Api; import io.swagger.annotations.ApiImplicitParam; import io.swagger.annotations.ApiImplicitParams; import io.swagger.annotations.ApiOperation; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.web.bind.annotation.*; import java.util.List; /** * @Description 部门管理 @@ -38,8 +44,7 @@ */ @ApiOperation(value = "新增", notes = "新增") @ApiImplicitParams(value = { @ApiImplicitParam(name = "param", value = "部门信息", required = true, dataType = "FinSysTenantDepartmentParam") }) @ApiImplicitParam(name = "param", value = "部门信息", required = true, dataType = "FinSysTenantDepartmentParam")}) @PostMapping("/add") public ResponseValue add() { FinSysTenantDepartmentParam param = CommonUtil.getObjFromReqBody(FinSysTenantDepartmentParam.class); @@ -53,12 +58,14 @@ if (StringUtils.isEmpty(param.getCode())) { return ResponseValue.error("编号为空"); } FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId()); FinSysTenantDepartment tenantDepartment = departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode()); if (tenantDepartment != null) { return ResponseValue.error("部门编号已存在"); } //判断同一机构id下 部门名称 是否重复 FinSysTenantDepartment department = this.departmentService.getByNameAndTenantId(param.getName(), param.getTenantId()); // 判断同一机构id下 部门名称 是否重复 FinSysTenantDepartment department = departmentService.getTenantDepartment(param.getName(), param.getTenantId(), null); if (department != null) { return ResponseValue.error("部门名称已存在"); } @@ -75,7 +82,7 @@ * @Author 卢庆阳 * @Date 2023/10/26 */ //如果不传机构id，默认查省级机构的部门 // 如果不传机构id，默认查省级机构的部门 @GetMapping("/list") public ResponseValue queryList() { FinSysTenantDepartmentParam param = CommonUtil.getObjFromReq(FinSysTenantDepartmentParam.class); @@ -91,11 +98,9 @@ return ResponseValue.success(pager); } @ApiOperation(value = "根据机构id查询所有部门列表信息", notes = "根据机构id查询所有部门列表信息") @ApiImplicitParams(value = { @ApiImplicitParam(name = "param", value = "部门信息", required = true, dataType = "FinSysTenantDepartmentParam") }) @ApiImplicitParam(name = "param", value = "部门信息", required = true, dataType = "FinSysTenantDepartmentParam")}) @GetMapping("/list/all") public ResponseValue queryAllDepartment(Long tenantId) { FinSysTenantUser sysInfo = this.getSysInfo(); @@ -134,7 +139,8 @@ if (sysInfo == null) { return ResponseValue.error("登录用户信息不存在"); } FinSysTenantDepartment tenantDepartment = this.departmentService.selectByCode(param.getCode(),param.getId()); FinSysTenantDepartment tenantDepartment = this.departmentService.getTenantDepartment(null, param.getTenantId(), param.getCode()); if (tenantDepartment != null) { return ResponseValue.error("部门编号已存在"); } @@ -184,6 +190,4 @@ return num > 0 ? ResponseValue.success(1) : ResponseValue.error("删除失败！"); } }
@@ -1,16 +1,17 @@ package com.consum.base.service; import java.util.List; import com.consum.base.pojo.FinSysTenantDepartmentParam; import com.consum.model.po.FinSysTenantDepartment; import com.consum.model.po.FinSysTenantUser; import com.walker.db.page.GenericPager; import com.walker.jdbc.service.BaseService; import java.util.List; public interface FinSysTenantDepartmentService extends BaseService { FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId); FinSysTenantDepartment getTenantDepartment(String name, Long tenantId, String code); /** * @Description 新增 @@ -25,8 +26,6 @@ * @Date 2023/10/26 */ GenericPager<FinSysTenantDepartment> queryList(FinSysTenantDepartmentParam param); FinSysTenantDepartment selectByCode(String code,Long id); /** * @Description 编辑 consum-base/src/main/java/com/consum/base/service/impl/FinSysTenantDepartmentServiceImpl.java
@@ -1,5 +1,11 @@ package com.consum.base.service.impl; import java.util.HashMap; import java.util.List; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import com.consum.base.Constants; import com.consum.base.core.utils.IdUtil; import com.consum.base.pojo.FinSysTenantDepartmentParam; @@ -10,12 +16,6 @@ import com.walker.infrastructure.utils.DateUtils; import com.walker.infrastructure.utils.StringUtils; import com.walker.jdbc.service.BaseServiceImpl; import org.springframework.beans.BeanUtils; import org.springframework.stereotype.Service; import java.util.ArrayList; import java.util.HashMap; import java.util.List; /** * @Description 部门管理 @@ -33,20 +33,26 @@ * @Date 2023/10/26 */ @Override public FinSysTenantDepartment getByNameAndTenantId(String name, Long tenantId) { public FinSysTenantDepartment getTenantDepartment(String name, Long tenantId, String code) { StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 "); HashMap<String, Object> paramts = new HashMap<>(); //部门名称 // 部门名称 if (!StringUtils.isEmpty(name)) { sql.append(" and name =:name "); paramts.put("name", name); } //机构id // 机构id if (tenantId != null) { sql.append(" and TENANT_ID =:TENANT_ID "); paramts.put("TENANT_ID", tenantId); } if (!StringUtils.isEmpty(code)) { sql.append("and CODE = :code "); paramts.put("code", code); } sql.append("and status = 1"); return this.get(sql.toString(), paramts, new FinSysTenantDepartment()); } @@ -61,9 +67,9 @@ BeanUtils.copyProperties(param, department); department.setId(IdUtil.generateId()); //创建人姓名 // 创建人姓名 department.setCreateBy(sysInfo.getUserName()); //创建时间 // 创建时间 department.setCreateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); return this.insert(department); @@ -79,22 +85,22 @@ StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 "); HashMap<String, Object> paramts = new HashMap<>(); //部门名称 // 部门名称 if (!StringUtils.isEmpty(param.getName())) { sql.append(" and name like:name "); paramts.put("name", StringUtils.CHAR_PERCENT + param.getName() + StringUtils.CHAR_PERCENT); } //编号 // 编号 if (!StringUtils.isEmpty(param.getCode())) { sql.append(" and code like:code "); paramts.put("code", StringUtils.CHAR_PERCENT + param.getCode() + StringUtils.CHAR_PERCENT); } //状态 // 状态 if (param.getStatus() != null) { sql.append(" and status =:status "); paramts.put("status", param.getStatus()); } //机构id // 机构id if (param.getTenantId() != null) { sql.append(" and TENANT_ID =:TENANT_ID "); paramts.put("TENANT_ID", param.getTenantId()); @@ -104,23 +110,6 @@ sql.append(" ORDER BY ORDER_NUM,CREATE_TIME DESC "); return selectSplit(sql.toString(), paramts, new FinSysTenantDepartment()); } @Override public FinSysTenantDepartment selectByCode(String code, Long id) { StringBuilder sql = new StringBuilder(QUERY_BY_CODE); ArrayList<Object> param = new ArrayList<>(2); param.add(code); if (id != null) { sql.append(" and id != ?"); param.add(id); } List<FinSysTenantDepartment> select = this.select(sql.toString(), param.toArray(), new FinSysTenantDepartment()); if (StringUtils.isEmptyList(select)) { return null; } else { return select.get(0); } } /** @@ -156,9 +145,9 @@ @Override public int updateById(FinSysTenantDepartment department, FinSysTenantUser currentUser) { department.setIsDelete(Constants.IS_DELETE_YES); //删除时间 // 删除时间 department.setUpdateTime(DateUtils.getDateTimeNumber(System.currentTimeMillis())); //删除人姓名 // 删除人姓名 department.setUpdateBy(currentUser.getUserName()); return this.update(department); } @@ -174,7 +163,7 @@ StringBuilder sql = new StringBuilder("SELECT * FROM fin_sys_tenant_department WHERE 1 = 1 and is_delete = 0 "); HashMap<String, Object> paramts = new HashMap<>(); //机构id // 机构id if (agencyId != null) { sql.append(" and TENANT_ID =:TENANT_ID "); paramts.put("TENANT_ID", agencyId);
