From f54545abf716d0af8b5a7f9cd749fa8cd95ea65a Mon Sep 17 00:00:00 2001
From: zzw <wander.zheng@qq.com>
Date: 星期一, 04 十二月 2023 15:58:21 +0800
Subject: [PATCH] 编号
---
zt/core/src/main/resources/mapper/sys/SysUserDao.xml | 12 +++---
zt/core/src/main/java/com/zt/modules/sys/controller/SysCompanyController.java | 10 ++--
zt/core/src/main/resources/mapper/sys/SysDeptDao.xml | 91 +++++++++++++++++++++++----------------------
zt/core/src/main/java/com/zt/modules/sys/service/SysDeptService.java | 2
4 files changed, 58 insertions(+), 57 deletions(-)
diff --git a/zt/core/src/main/java/com/zt/modules/sys/controller/SysCompanyController.java b/zt/core/src/main/java/com/zt/modules/sys/controller/SysCompanyController.java
index 9ce5a6c..8c7a7e2 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/controller/SysCompanyController.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/controller/SysCompanyController.java
@@ -39,7 +39,7 @@
@GetMapping("tree")
@ApiOperation("鍒楄〃")
- @RequiresPermissions("sys:company:list")
+ //@RequiresPermissions("sys:company:list")
public Result<List<SysDept>> list() {
List<SysDept> list = sysDeptService.getCompanyTree();
@@ -49,7 +49,7 @@
@GetMapping("{id}")
@ApiOperation("淇℃伅")
- @RequiresPermissions("sys:company:info")
+ //@RequiresPermissions("sys:company:info")
public Result<SysDept> get(@PathVariable("id") Long id) {
SysDept data = sysDeptService.get(id);
@@ -59,7 +59,7 @@
@PostMapping
@ApiOperation("鏂板")
@LogOperation("缁勭粐绠＄悊妯″潡--->鏂板")
- @RequiresPermissions("sys:company")
+ //@RequiresPermissions("sys:company")
public Result insert(@RequestBody SysDept entity) {
// 榛樿鍩虹淇℃伅
@@ -74,7 +74,7 @@
@PutMapping
@ApiOperation("淇敼")
@LogOperation("缁勭粐绠＄悊妯″潡--->淇敼")
- @RequiresPermissions("sys:company:update")
+ //@RequiresPermissions("sys:company:update")
public Result update(@RequestBody SysDept entity) {
// 鏁堥獙鏁版嵁
ValidatorUtils.validateEntity(entity, UpdateGroup.class, DefaultGroup.class);
@@ -87,7 +87,7 @@
@DeleteMapping
@ApiOperation("鍒犻櫎")
@LogOperation("缁勭粐绠＄悊妯″潡--->鍒犻櫎")
- @RequiresPermissions("sys:company:delete")
+ //@RequiresPermissions("sys:company:delete")
public Result delete(@RequestBody Long[] ids) {
// 鏁堥獙鏁版嵁
AssertUtils.isArrayEmpty(ids, "ids");
diff --git a/zt/core/src/main/java/com/zt/modules/sys/service/SysDeptService.java b/zt/core/src/main/java/com/zt/modules/sys/service/SysDeptService.java
index e67318e..42e57af 100644
--- a/zt/core/src/main/java/com/zt/modules/sys/service/SysDeptService.java
+++ b/zt/core/src/main/java/com/zt/modules/sys/service/SysDeptService.java
@@ -217,7 +217,7 @@
if (dept.isCompany()) {
dept.setCompanyId(dept.getId());
}
-
+ dept.setTenantId(1L);
super.insert(dept);
// 鏇存柊鏁版嵁鑼冨洿琛�
diff --git a/zt/core/src/main/resources/mapper/sys/SysDeptDao.xml b/zt/core/src/main/resources/mapper/sys/SysDeptDao.xml
index 4cb0328..0137dac 100644
--- a/zt/core/src/main/resources/mapper/sys/SysDeptDao.xml
+++ b/zt/core/src/main/resources/mapper/sys/SysDeptDao.xml
@@ -4,32 +4,33 @@
<mapper namespace="com.zt.modules.sys.dao.SysDeptDao">
<select id="getAll" resultType="com.zt.core.sys.model.SysDept">
- select a.dept_id as id
- ,a.dept_name as name
- ,a.parent_id as pid
- ,a.dept_code as code
- ,a.ancestors as pids
- ,a.dept_type as nature
- ,a.order_num as sort
- ,(select t2.dept_name from SYS_DEPT t2 where t2.dept_id=a.parent_id) parentName
- ,(select t2.dept_name from SYS_DEPT t2 where t2.dept_id = a.parent_id) companyName
+ select a.id as id
+ ,a.name as name
+ ,a.pid as pid
+ ,a.code as code
+ ,a.pids as pids
+ ,a.IS_COMPANY
+ ,a.nature as nature
+ ,a.sort as sort
+ ,(select t2.name from SYS_DEPT t2 where t2.id=a.pid) parentName
+ ,(select t2.name from SYS_DEPT t2 where t2.id = a.pid) companyName
from SYS_DEPT a
- where a.del_flag = 0
- order by a.dept_type, a.order_num asc
+ where a.is_delete = 0
+ order by a.nature, a.sort asc
</select>
<select id="getList" resultType="com.zt.core.sys.model.SysDept">
- select a.dept_id as id
- ,a.dept_name as name
- ,a.dept_code as code
- ,a.parent_id as pid
- ,a.ancestors as pids
- ,a.dept_type as nature
- ,a.order_num as sort
- ,(select t2.dept_name from SYS_DEPT t2 where t2.dept_id=a.parent_id) parentName
+ select a.id as id
+ ,a.name as name
+ ,a.code as code
+ ,a.pid as pid
+ ,a.pids as pids
+ ,a.nature as nature
+ ,a.sort as sort
+ ,(select t2.name from SYS_DEPT t2 where t2.id=a.pid) parentName
from SYS_DEPT a
- where a.del_flag=0
-<!-- <if test="isCompany != null">
+ where a.is_delete=0
+ <if test="isCompany != null">
and a.is_company = #{isCompany}
</if>
<if test="companyId != null">
@@ -37,49 +38,49 @@
</if>
<if test="tenantId != null">
and a.tenant_id = #{tenantId}
- </if>-->
+ </if>
<if test="deptIds != null">
and a.id in
<foreach item="id" collection="deptIds" open="(" separator="," close=")">
#{id}
</foreach>
</if>
- order by a.order_num asc
+ order by a.sort asc
</select>
<select id="getById" resultType="com.zt.core.sys.model.SysDept">
- select a.dept_id as id
- ,a.dept_name as name
- ,a.dept_code as code
- ,a.parent_id as pid
- ,a.ancestors as pids
- ,a.dept_type as nature
- ,a.order_num as sort
- ,(select t2.dept_name from SYS_DEPT t2 where t2.dept_id=a.parent_id) parentName
+ select a.id
+ ,a.name
+ ,a.code
+ ,a.pid
+ ,a.pids
+ ,a.nature
+ ,a.sort
+ ,(select t2.name from SYS_DEPT t2 where t2.id=a.pid) parentName
from SYS_DEPT a
- where a.del_flag=0
- and a.dept_id = #{value}
+ where a.is_delete=0
+ and a.id = #{value}
</select>
<select id="getListByParent" resultType="com.zt.core.sys.model.SysDept">
- select a.dept_id as id
- ,a.dept_name as name
- ,a.dept_code as code
- ,a.parent_id as pid
- ,a.ancestors as pids
- ,a.dept_type as nature
- ,a.order_num as sort
- ,(select t2.dept_name from SYS_DEPT t2 where t2.dept_id=a.parent_id) parentName
+ select a.id
+ ,a.name
+ ,a.code
+ ,a.pid
+ ,a.pids
+ ,a.nature
+ ,a.sort
+ ,(select t2.name from SYS_DEPT t2 where t2.id=a.pid) parentName
from SYS_DEPT a
- where a.del_flag=0
+ where a.is_delete=0
<if test="pCode != null">
- and parent_id in (select dept_id from SYS_DEPT where dept_CODE= #{pCode})
+ and pid in (select id from SYS_DEPT where code= #{pCode})
</if>
<if test="code != null">
- and dept_CODE= #{code}
+ and code= #{code}
</if>
<if test="pId != null">
- and parent_id = #{pId}
+ and pid = #{pId}
</if>
</select>
</mapper>
diff --git a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
index 72e3dbe..5884878 100644
--- a/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
+++ b/zt/core/src/main/resources/mapper/sys/SysUserDao.xml
@@ -5,7 +5,7 @@
<select id="getList" resultType="com.zt.core.sys.model.SysUser">
select a.*
- ,(select t2.dept_name from SYS_DEPT t2 where t2.dept_id = a.dept_id) deptName
+ ,(select t2.name from SYS_DEPT t2 where t2.id = a.dept_id) deptName
from SYS_USER a
where a.is_delete = 0
<if test="username != null and username.trim() != ''">
@@ -36,7 +36,7 @@
, a.username
, a.real_name
, a.MOBILE
- , (select t2.dept_name from SYS_DEPT t2 where t2.dept_id = a.dept_id) deptName
+ , (select t2.name from SYS_DEPT t2 where t2.id = a.dept_id) deptName
from SYS_USER a
where a.del_flag = 0
and a.id = #{value}
@@ -51,7 +51,7 @@
, a.username
, a.real_name
, a.MOBILE
- , (select t2.dept_name from SYS_DEPT t2 where t2.dept_id = a.dept_id) deptName
+ , (select t2.name from SYS_DEPT t2 where t2.id = a.dept_id) deptName
, a.password
from SYS_USER a
where a.is_delete = 0
@@ -92,7 +92,7 @@
and dept_id = #{unitid}
</if>
<if test="code != null and code != ''">
- or dept_id in (select dept_id from SYS_DEPT where dept_code=#{code}))
+ or dept_id in (select id from SYS_DEPT where code=#{code}))
</if>
<if test="password != null and password != ''">
and password = #{password}
@@ -107,7 +107,7 @@
, a.username
, a.real_name
, a.MOBILE
- , (select t2.dept_name from SYS_DEPT t2 where t2.dept_id = a.dept_id) deptName
+ , (select t2.name from SYS_DEPT t2 where t2.id = a.dept_id) deptName
from SYS_USER a
where a.is_delete = 0
# and a.code = #{code}
@@ -117,7 +117,7 @@
SELECT
a.real_Name,
c.name as roleName,
- (select dept_name from SYS_DEPT d where a.DEPT_ID = d.DEPT_ID AND d.del_flag=0 limit 1 ) as deptName
+ (select name from SYS_DEPT d where a.DEPT_ID = d.ID AND d.is_delete=0 limit 1 ) as deptName
FROM
SYS_USER a,
SYS_ROLE_USER b,
--
Gitblit v1.9.1