优化报表功能

service-user/src/main/java/com/java110/user/cmd/org/DeleteOrgCmd.java

@@ -73,6 +73,10 @@ public class DeleteOrgCmd extends Cmd {
 
         Assert.listOnlyOne(orgDtos, "不存在");
 
+        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);

service-user/src/main/java/com/java110/user/cmd/owner/SaveOwnerCmd.java

@@ -187,6 +187,7 @@ public class SaveOwnerCmd extends Cmd {
         }
         //生成memberId
         generateMemberId(reqJson);
+
         JSONObject businessOwner = new JSONObject();
         businessOwner.putAll(reqJson);
         businessOwner.put("state", "2000");
@@ -215,9 +216,8 @@ public class SaveOwnerCmd extends Cmd {
                 reqJson.getString("memberId"),
                 reqJson.getString("communityId"),
                 "10000");
-        dealOwnerAttr(reqJson, cmdDataFlowContext);
-
 
+        dealOwnerAttr(reqJson, cmdDataFlowContext);
 
 
         String autoUser = MappingCache.getValue(MappingConstant.DOMAIN_SYSTEM_SWITCH, "AUTO_GENERATOR_OWNER_USER");