Merge pull request 'BUG修复' (#143) from feature/dxf into develop

Reviewed-on: #143

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

@@ -448,7 +448,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
             topMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("customization").menuIcon("icon-coms-task-list").menuName("列定制").type("BTN_COLUMN").build());
             btnDatas.put("topMenu", topMenuList);
             rightMenuList.add(MenuBtn.builder().isBatch("1").isTop("1").menuFun("new").menuIcon("icon-coms-New-Flow").menuName("新建人员").type("BTN_Addnew").build());
-            rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build());
+            //rightMenuList.add(MenuBtn.builder().isBatch("0").isTop("0").menuFun("custom").menuIcon("icon-coms-task-list").menuName("显示列定制").type("BTN_COLUMN").build());
             rightMenuList.add(MenuBtn.rightMenu_btnLog());
             btnDatas.put("rightMenu", rightMenuList);
         }
@@ -617,7 +617,7 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
 
         DBType dbType = DBType.get(new RecordSet().getDBType());
-        StringBuilder sb = new StringBuilder(" where 1=1 ");
+        StringBuilder sb = new StringBuilder(" where 1=1 and t.status <4 ");
         for (Map.Entry<String, Object> entry : params.entrySet()) {
             String value = Util.null2String(entry.getValue());
             if (StringUtils.isBlank(value)) {