Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
G
govdna
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
开发共享交流平台
govdna
Commits
616496b1
Commit
616496b1
authored
6 years ago
by
刘弈臻
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
部门删除修改
parent
a427fdaa
Hide whitespace changes
Inline
Side-by-side
Showing
9 changed files
with
12 additions
and
32 deletions
+12
-32
DepartController.java
...m/govmade/modules/system/controller/DepartController.java
+4
-4
DepartDao.java
src/main/java/com/govmade/modules/system/dao/DepartDao.java
+0
-4
UserDao.java
src/main/java/com/govmade/modules/system/dao/UserDao.java
+0
-2
DepartService.java
...ava/com/govmade/modules/system/service/DepartService.java
+1
-1
UserService.java
.../java/com/govmade/modules/system/service/UserService.java
+1
-1
DepartServiceImpl.java
...ovmade/modules/system/service/impl/DepartServiceImpl.java
+4
-2
UserServiceImpl.java
.../govmade/modules/system/service/impl/UserServiceImpl.java
+2
-2
DepartDao.xml
src/main/resources/mapper/system/DepartDao.xml
+0
-8
UserDao.xml
src/main/resources/mapper/system/UserDao.xml
+0
-8
No files found.
src/main/java/com/govmade/modules/system/controller/DepartController.java
View file @
616496b1
...
...
@@ -70,12 +70,12 @@ public class DepartController extends AbstractController{
* @return
*/
@DeleteMapping
(
"/delete"
)
public
R
deleteDepart
(
@RequestBody
Set
<
Long
>
ids
)
{
Assert
.
isNull
(
ids
,
"删除项不能为空"
);
if
(
this
.
userService
.
userCount
(
ids
)>
0
)
{
public
R
deleteDepart
(
@RequestBody
DepartEntity
depart
)
{
Assert
.
isNull
(
depart
.
getId
()
,
"删除项不能为空"
);
if
(
this
.
userService
.
userCount
(
depart
.
getId
()
)>
0
)
{
return
R
.
error
(
"选中部门下有用户!!"
);
}
departService
.
deleteBatch
(
ids
);
departService
.
deleteBatch
(
depart
);
return
R
.
ok
();
}
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/dao/DepartDao.java
View file @
616496b1
...
...
@@ -17,8 +17,4 @@ import com.govmade.modules.system.entity.DepartEntity;
@Mapper
public
interface
DepartDao
extends
BaseMapper
<
DepartEntity
>{
/**
* 批量删除或删除
*/
void
deleteBatch
(
@Param
(
"ids"
)
Set
<
Long
>
ids
);
}
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/dao/UserDao.java
View file @
616496b1
...
...
@@ -37,6 +37,4 @@ public interface UserDao extends BaseMapper<UserEntity> {
void
deleteBatch
(
@Param
(
"ids"
)
Set
<
Long
>
ids
);
Integer
userCount
(
@Param
(
"ids"
)
Set
<
Long
>
ids
);
}
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/service/DepartService.java
View file @
616496b1
...
...
@@ -28,7 +28,7 @@ public interface DepartService extends IService<DepartEntity>{
/**
* 删除部门
*/
void
deleteBatch
(
Set
<
Long
>
ids
);
void
deleteBatch
(
DepartEntity
depart
);
/**
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/service/UserService.java
View file @
616496b1
...
...
@@ -43,5 +43,5 @@ public interface UserService extends IService<UserEntity> {
UserEntity
queryOne
(
Map
<
String
,
Object
>
params
);
Integer
userCount
(
Set
<
Long
>
ids
);
Integer
userCount
(
Long
id
);
}
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/service/impl/DepartServiceImpl.java
View file @
616496b1
...
...
@@ -8,6 +8,7 @@ import org.springframework.stereotype.Service;
import
com.baomidou.mybatisplus.mapper.EntityWrapper
;
import
com.baomidou.mybatisplus.plugins.Page
;
import
com.baomidou.mybatisplus.service.impl.ServiceImpl
;
import
com.govmade.common.utils.Constant
;
import
com.govmade.common.utils.PageUtils
;
import
com.govmade.common.utils.Query
;
import
com.govmade.modules.system.dao.DepartDao
;
...
...
@@ -43,8 +44,9 @@ public class DepartServiceImpl extends ServiceImpl<DepartDao,DepartEntity> imple
}
@Override
public
void
deleteBatch
(
Set
<
Long
>
ids
)
{
this
.
baseMapper
.
deleteBatch
(
ids
);
public
void
deleteBatch
(
DepartEntity
depart
)
{
depart
.
setState
(
Constant
.
STATE_DELETE
);
super
.
updateById
(
depart
);
}
@Override
...
...
This diff is collapsed.
Click to expand it.
src/main/java/com/govmade/modules/system/service/impl/UserServiceImpl.java
View file @
616496b1
...
...
@@ -73,7 +73,7 @@ public class UserServiceImpl extends ServiceImpl<UserDao, UserEntity> implements
}
@Override
public
Integer
userCount
(
Set
<
Long
>
ids
)
{
return
this
.
baseMapper
.
userCount
(
ids
);
public
Integer
userCount
(
Long
id
)
{
return
super
.
selectCount
(
new
EntityWrapper
<
UserEntity
>().
eq
(
"dept_id"
,
id
));
}
}
This diff is collapsed.
Click to expand it.
src/main/resources/mapper/system/DepartDao.xml
View file @
616496b1
...
...
@@ -3,11 +3,4 @@
<mapper
namespace=
"com.govmade.modules.system.dao.DepartDao"
>
<!-- 批量删除 -->
<update
id=
"deleteBatch"
>
UPDATE system_departs SET state =${@com.govmade.common.utils.Constant@STATE_DELETE} WHERE id IN
<foreach
collection=
"ids"
item=
"id"
open=
"("
close=
")"
separator=
","
>
#{id}
</foreach>
</update>
</mapper>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
src/main/resources/mapper/system/UserDao.xml
View file @
616496b1
...
...
@@ -10,11 +10,4 @@
#{id}
</foreach>
</update>
<select
id=
"userCount"
resultType=
"Integer"
>
SELECT COUNT(*) FROM system_users WHERE state =${@com.govmade.common.utils.Constant@STATE_NORMAL} AND dept_id IN
<foreach
collection=
"ids"
item=
"id"
open=
"("
close=
")"
separator=
","
>
#{id}
</foreach>
</select>
</mapper>
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment