From bef63439b2bf223dc193d141c39cf8b47073a068 Mon Sep 17 00:00:00 2001
From: dxfeng <dongxuefengdd@163.com>
Date: Tue, 5 Jul 2022 18:46:43 +0800
Subject: [PATCH] =?UTF-8?q?=E8=AE=B0=E5=BD=95=E6=93=8D=E4=BD=9C=E6=97=A5?=
 =?UTF-8?q?=E5=BF=97?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../logview/param/LogViewSearchParam.java     |  1 -
 .../{ => impl}/LogViewServiceImpl.java        | 26 ++-----------------
 .../organization/wrapper/LogViewWrapper.java  |  2 +-
 3 files changed, 3 insertions(+), 26 deletions(-)
 rename src/com/engine/organization/service/{ => impl}/LogViewServiceImpl.java (74%)

diff --git a/src/com/engine/organization/entity/logview/param/LogViewSearchParam.java b/src/com/engine/organization/entity/logview/param/LogViewSearchParam.java
index cd829bb8..7e031d86 100644
--- a/src/com/engine/organization/entity/logview/param/LogViewSearchParam.java
+++ b/src/com/engine/organization/entity/logview/param/LogViewSearchParam.java
@@ -19,7 +19,6 @@ public class LogViewSearchParam {
     private Long companyId;
     private Long departmentId;
     private String operateDate;
-    private String operateModule;
     private String startDate;
     private String endDate;
     private String moduleType;
diff --git a/src/com/engine/organization/service/LogViewServiceImpl.java b/src/com/engine/organization/service/impl/LogViewServiceImpl.java
similarity index 74%
rename from src/com/engine/organization/service/LogViewServiceImpl.java
rename to src/com/engine/organization/service/impl/LogViewServiceImpl.java
index 951579b9..d05822a5 100644
--- a/src/com/engine/organization/service/LogViewServiceImpl.java
+++ b/src/com/engine/organization/service/impl/LogViewServiceImpl.java
@@ -1,4 +1,4 @@
-package com.engine.organization.service;
+package com.engine.organization.service.impl;
 
 import com.api.browser.bean.SearchConditionGroup;
 import com.api.browser.bean.SearchConditionItem;
@@ -8,6 +8,7 @@ import com.engine.core.impl.Service;
 import com.engine.organization.component.OrganizationWeaTable;
 import com.engine.organization.entity.logview.param.LogViewSearchParam;
 import com.engine.organization.entity.logview.vo.LogViewVO;
+import com.engine.organization.service.LogViewService;
 import com.engine.organization.util.OrganizationFormItemUtil;
 import org.apache.commons.lang.StringUtils;
 import weaver.general.TimeUtil;
@@ -65,30 +66,10 @@ public class LogViewServiceImpl extends Service implements LogViewService {
         SearchConditionItem departmentId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者部门", "161", "departmentId", "deptBrowser");
         // 操作者分部
         SearchConditionItem companyId = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "操作者分部", "161", "companyId", "compBrowser");
-        // 操作模块
-        //List<SearchConditionOption> selectOperateModule = new ArrayList<>();
-        //
-        //selectOperateDate.add(new SearchConditionOption("-1", "全部"));
-        //selectOperateDate.add(new SearchConditionOption("1", "等级方案"));
-        //selectOperateDate.add(new SearchConditionOption("2", "职等"));
-        //selectOperateDate.add(new SearchConditionOption("3", "职级"));
-        //selectOperateDate.add(new SearchConditionOption("4", "岗位序列"));
-        //selectOperateDate.add(new SearchConditionOption("5", "职务分类"));
-        //selectOperateDate.add(new SearchConditionOption("6", "职务管理"));
-        //selectOperateDate.add(new SearchConditionOption("7", "集团管理"));
-        //selectOperateDate.add(new SearchConditionOption("8", "分部管理"));
-        //selectOperateDate.add(new SearchConditionOption("9", "部门管理"));
-        //selectOperateDate.add(new SearchConditionOption("10", "岗位管理"));
-        //selectOperateDate.add(new SearchConditionOption("11", "人员管理"));
-        //selectOperateDate.add(new SearchConditionOption("12", "编制方案"));
-        //selectOperateDate.add(new SearchConditionOption("13", "编制上报"));
-        //selectOperateDate.add(new SearchConditionOption("99", "其他模块"));
-        //SearchConditionItem operateModule = OrganizationFormItemUtil.selectItem(user, selectOperateModule, 2, 16, 6, false, "操作模块", "operateModule");
         conditionItems.add(operatorId);
         conditionItems.add(operateDate);
         conditionItems.add(departmentId);
         conditionItems.add(companyId);
-        //conditionItems.add(operateModule);
 
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
         apiDatas.put("conditions", addGroups);
@@ -125,9 +106,6 @@ public class LogViewServiceImpl extends Service implements LogViewService {
                 }
             }
         }
-        //if (StringUtils.isNotBlank(param.getOperateModule()) && !"-1".equals(param.getOperateModule())) {
-        //    sqlWhere += " and operate_module = '" + param.getOperateModule() + "'";
-        //}
         return sqlWhere;
     }
 }
diff --git a/src/com/engine/organization/wrapper/LogViewWrapper.java b/src/com/engine/organization/wrapper/LogViewWrapper.java
index 388f85fa..a40ba337 100644
--- a/src/com/engine/organization/wrapper/LogViewWrapper.java
+++ b/src/com/engine/organization/wrapper/LogViewWrapper.java
@@ -3,7 +3,7 @@ package com.engine.organization.wrapper;
 import com.engine.common.util.ServiceUtil;
 import com.engine.organization.entity.logview.param.LogViewSearchParam;
 import com.engine.organization.service.LogViewService;
-import com.engine.organization.service.LogViewServiceImpl;
+import com.engine.organization.service.impl.LogViewServiceImpl;
 import com.engine.organization.util.OrganizationWrapper;
 import weaver.hrm.User;