Merge pull request '花名册树、角色展示、组织透视下拉框' (#64) from feature/dxf into develop

Reviewed-on: #64

src/com/engine/organization/entity/job/bo/JobBO.java

@@ -151,7 +151,7 @@ public class JobBO {
         return builderJobs.stream().map(item -> {
             SearchTree tree = new SearchTree();
             tree.setCanClick(true);
-            tree.setCanceled(false);
+            tree.setCanceled(item.getForbiddenTag() != 0);
             tree.setIcon("icon-coms-content-o");
             tree.setId(item.getId().toString());
             tree.setIsParent(false);

src/com/engine/organization/service/impl/OrgChartServiceImpl.java

@@ -50,19 +50,19 @@ public class OrgChartServiceImpl extends Service implements OrgChartService {
             item.put("companyname", rs.getString("companyname"));
             fclasslist.add(item);
         }
-        String sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) order by ftype , id,fdateend desc ";
+        String sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype in (0, 1) ";
 
         // 分部分权过滤
         DetachUtil detachUtil = new DetachUtil(user.getUID());
         if (detachUtil.isDETACH()) {
             String jclRoleLevels = detachUtil.getJclRoleLevels();
             if (StringUtils.isNotBlank(jclRoleLevels)) {
-                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid  in(" + jclRoleLevels + "))) order by ftype , id,fdateend desc";
+                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where (ftype = 0 or (ftype = 1 and fobjid  in(" + jclRoleLevels + "))) ";
             } else {
-                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype = 0  order by ftype , id,fdateend desc";
+                sql = "select distinct id, fnumber, fname, ftype from jcl_org_map where ftype = 0 ";
             }
         }
-        rs.executeQuery(sql);
+        rs.executeQuery(sql + " and fdateend > " + DBType.get(new RecordSet().getDBType()).currentDate() + " order by ftype , id,fdateend desc ");
         Set<OrgSelectItem> companySet = new HashSet<>();
         while (rs.next()) {
             OrgSelectItem item = new OrgSelectItem();

src/com/engine/organization/transmethod/SystemTransMethod.java

@@ -19,7 +19,7 @@ public class SystemTransMethod {
         List<String> list = new ArrayList<>();
         if (StringUtils.isNotBlank(roleIds)) {
             for (String roleId : roleIds.split(",")) {
-                list.add(rolesComInfo.getRolesname(roleId));
+                list.add(rolesComInfo.getRolesRemark(roleId));
             }
         }
         return StringUtils.join(list,",");

src/com/engine/organization/util/db/DBOperateAdapter.java

@@ -4,4 +4,6 @@ public interface DBOperateAdapter {
     String like(String some);
 
     String concat(String some);
+
+    String currentDate();
 }

src/com/engine/organization/util/db/DBType.java

@@ -15,6 +15,11 @@ public enum DBType implements DBOperateAdapter {
         public String concat(String some) {
             return " concat(','," + some + ",',') ";
         }
+
+        @Override
+        public String currentDate() {
+            return "now()";
+        }
     },
     SQLSERVER("sqlserver") {
         @Override
@@ -26,6 +31,11 @@ public enum DBType implements DBOperateAdapter {
         public String concat(String some) {
             return " ','+" + some + "+',' ";
         }
+
+        @Override
+        public String currentDate() {
+            return "GETDATE()";
+        }
     },
     ORACLE("oracle") {
         @Override
@@ -37,6 +47,11 @@ public enum DBType implements DBOperateAdapter {
         public String concat(String some) {
             return " ',' ||" + some + "|| ',' ";
         }
+
+        @Override
+        public String currentDate() {
+            return "SYSDATE";
+        }
     };
 
     private String dbtype;