From 0fea532b07be89978343cb4aede3693af99f5656 Mon Sep 17 00:00:00 2001
From: Your Name <you@example.com>
Date: 星期二, 25 七月 2023 23:04:41 +0800
Subject: [PATCH] Merge branch 'master' of http://git.homecommunity.cn/supervip/MicroCommunity
---
service-user/src/main/java/com/java110/user/cmd/org/DeleteOrgCmd.java | 49 +++++++++++++++++++++++++------------------------
1 files changed, 25 insertions(+), 24 deletions(-)
diff --git a/service-user/src/main/java/com/java110/user/cmd/org/DeleteOrgCmd.java b/service-user/src/main/java/com/java110/user/cmd/org/DeleteOrgCmd.java
index da32d6e..2388885 100644
--- a/service-user/src/main/java/com/java110/user/cmd/org/DeleteOrgCmd.java
+++ b/service-user/src/main/java/com/java110/user/cmd/org/DeleteOrgCmd.java
@@ -19,7 +19,7 @@
import com.java110.core.annotation.Java110Cmd;
import com.java110.core.annotation.Java110Transactional;
import com.java110.core.context.ICmdDataFlowContext;
-import com.java110.core.event.cmd.AbstractServiceCmdListener;
+import com.java110.core.event.cmd.Cmd;
import com.java110.core.event.cmd.CmdEvent;
import com.java110.dto.org.OrgDto;
import com.java110.dto.org.OrgStaffRelDto;
@@ -49,7 +49,7 @@
* // modify by 寮犱笁 at 2021-09-12 绗�10琛屽湪鏌愮鍦烘櫙涓嬪瓨鍦ㄦ煇绉峛ug 闇�瑕佷慨澶嶏紝娉ㄩ噴10鑷�20琛� 鍔犲叆 20琛岃嚦30琛�
*/
@Java110Cmd(serviceCode = "org.deleteOrg")
-public class DeleteOrgCmd extends AbstractServiceCmdListener {
+public class DeleteOrgCmd extends Cmd {
private static Logger logger = LoggerFactory.getLogger(DeleteOrgCmd.class);
@Autowired
@@ -73,29 +73,30 @@
Assert.listOnlyOne(orgDtos, "涓嶅瓨鍦�");
- if (OrgDto.ORG_LEVEL_COMPANY.equals(orgDtos.get(0).getOrgLevel())) {
- //鏌ヨ鏄惁瀛樺湪閮ㄩ棬
- orgDto = new OrgDto();
- orgDto.setParentOrgId(reqJson.getString("orgId"));
- List<OrgDto> subOrgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);
- if (subOrgDtos != null && subOrgDtos.size() > 0) {
- throw new CmdException("鍏徃涓嬪瓨鍦ㄩ儴闂� 璇峰厛鍒犻櫎閮ㄩ棬鍚庡啀鍒犻櫎");
- }
- }else if (OrgDto.ORG_LEVEL_DEPARTMENT.equals(orgDtos.get(0).getOrgLevel())) {
- //鏌ヨ鏄惁瀛樺湪閮ㄩ棬
- OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
- orgStaffRelDto.setOrgId(reqJson.getString("orgId"));
- List<OrgStaffRelDto> subOrgDtos = orgStaffRelV1InnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
- if (subOrgDtos == null || subOrgDtos.size() < 1) {
- return;
- }
- UserDto userDto = new UserDto();
- userDto.setUserId(subOrgDtos.get(0).getStaffId());
- List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
- if (userDtos != null && userDtos.size() > 0) {
- throw new CmdException("閮ㄩ棬涓嬪瓨鍦ㄥ憳宸� 璇峰厛鍒犻櫎鍛樺伐鍚庡啀鍒犻櫎");
- }
+ if (OrgDto.ORG_LEVEL_STORE.equals(orgDtos.get(0).getOrgLevel())) {
+ throw new CmdException("涓�绾х粍缁囦笉鑳藉垹闄�");
}
+
+ orgDto = new OrgDto();
+ orgDto.setParentOrgId(reqJson.getString("orgId"));
+ List<OrgDto> subOrgDtos = orgV1InnerServiceSMOImpl.queryOrgs(orgDto);
+ if (subOrgDtos != null && subOrgDtos.size() > 0) {
+ throw new CmdException("瀛樺湪瀛愮粍缁�");
+ }
+
+ OrgStaffRelDto orgStaffRelDto = new OrgStaffRelDto();
+ orgStaffRelDto.setOrgId(reqJson.getString("orgId"));
+ List<OrgStaffRelDto> orgStaffRelDtos = orgStaffRelV1InnerServiceSMOImpl.queryOrgStaffRels(orgStaffRelDto);
+ if (orgStaffRelDtos == null || orgStaffRelDtos.size() < 1) {
+ return;
+ }
+ UserDto userDto = new UserDto();
+ userDto.setUserId(orgStaffRelDtos.get(0).getStaffId());
+ List<UserDto> userDtos = userV1InnerServiceSMOImpl.queryUsers(userDto);
+ if (userDtos != null && userDtos.size() > 0) {
+ throw new CmdException("瀛樺湪鍛樺伐 璇峰厛鍒犻櫎鍛樺伐鍚庡啀鍒犻櫎");
+ }
+
}
@Override
--
Gitblit v1.8.0