移除弃用的方法,增加status默认值

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimpleOrganizationalService.java

@@ -16,24 +16,14 @@
  */
 package org.hswebframework.web.service.organizational.simple;
 
-import com.alibaba.fastjson.JSON;
-import org.hswebframework.web.commons.entity.GenericEntity;
+import org.hswebframework.web.commons.entity.DataStatus;
 import org.hswebframework.web.dao.organizational.OrganizationalDao;
 import org.hswebframework.web.entity.organizational.OrganizationalEntity;
-import org.hswebframework.web.entity.organizational.SimpleOrganizationalEntity;
 import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.service.AbstractTreeSortService;
-import org.hswebframework.web.service.GenericEntityService;
 import org.hswebframework.web.service.organizational.OrganizationalService;
-import org.hswebframework.utils.ListUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
-import org.springframework.util.Assert;
-import org.springframework.util.CollectionUtils;
-
-import java.util.*;
-import java.util.function.Function;
-import java.util.stream.Collectors;
 
 /**
  * 默认的服务实现
@@ -57,18 +47,8 @@ public class SimpleOrganizationalService extends AbstractTreeSortService<Organiz
     }
 
     @Override
-    public List<String> getAllCanUseRoleIds() {
-        // TODO: 17-3-1
-        return null;
-    }
-
-    @Override
-    public List<String> getCanUseRoleIds(List<String> orgIds) {
-        if (orgIds == null || orgIds.isEmpty()) return new ArrayList<>();
-        return createQuery().where().in(GenericEntity.id, orgIds).listNoPaging()
-                .stream().map(OrganizationalEntity::getOptionalRoles) //得到机构可选角色id集合
-                .filter(Objects::nonNull)
-                .flatMap(List::stream)
-                .collect(Collectors.toList());
+    public String insert(OrganizationalEntity entity) {
+        entity.setStatus(DataStatus.STATUS_ENABLED);
+        return super.insert(entity);
     }
 }

hsweb-system/hsweb-system-organizational/hsweb-system-organizational-service/hsweb-system-organizational-service-simple/src/main/java/org/hswebframework/web/service/organizational/simple/SimplePositionService.java

@@ -20,7 +20,6 @@ import org.hswebframework.web.dao.organizational.PositionDao;
 import org.hswebframework.web.entity.organizational.PositionEntity;
 import org.hswebframework.web.id.IDGenerator;
 import org.hswebframework.web.service.AbstractTreeSortService;
-import org.hswebframework.web.service.GenericEntityService;
 import org.hswebframework.web.service.organizational.PositionService;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;