人员相关BUG修复

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

@@ -655,6 +655,7 @@ public class DepartmentServiceImpl extends Service implements DepartmentService
         // 更新当前部门下的人员
         List<Long> hrmResourceIds = getSystemDataMapper().getHrmResourceIdsByDept(mergeParam.getId().toString());
         rs.executeUpdate("update hrmresource set SUBCOMPANYID1 =?,DEPARTMENTID =? where DEPARTMENTID =?", targetDepartment.getEcCompany(), targetEcDeptId, mergeEcDeptId);
+        new RecordSet().executeUpdate("update jcl_org_hrmresource set company_id =? ,ec_company = ? ,department_id = ?, ec_department = ?where department_id =?", targetDepartment.getParentComp(), targetDepartment.getEcCompany(), targetDepartment.getId(), targetEcDeptId, mergeParam.getId());
         // 更新人员组织架构图
         for (Long hrmResourceId : hrmResourceIds) {
             new Thread(new HrmResourceTriggerRunnable(hrmResourceId)).start();

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

@@ -303,7 +303,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         SearchConditionItem departmentIdItem = OrganizationFormItemUtil.browserItem(user, 2, 16, 2, false, "部门", "4", "ecDepartment", "");
         SearchConditionItem telephoneItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "办公电话", "telephone");
         SearchConditionItem mobileItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "移动电话", "mobile");
-        SearchConditionItem mobileCallItem = OrganizationFormItemUtil.inputItem(user, 2, 16, 2, 50, "其他电话", "mobileCall");
 
         conditionItems.add(lastNameItem);
         conditionItems.add(jobTitleItem);
@@ -311,7 +310,6 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         conditionItems.add(departmentIdItem);
         conditionItems.add(telephoneItem);
         conditionItems.add(mobileItem);
-        conditionItems.add(mobileCallItem);
 
         addGroups.add(new SearchConditionGroup("高级搜索条件", true, conditionItems));
         apiDatas.put("conditions", addGroups);

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

@@ -102,10 +102,10 @@ public class LogViewServiceImpl extends Service implements LogViewService {
         if (null != param.getDepartmentId()) {
             sqlWhere += " and operator_id in (select id from hrmresource where departmentid = '" + param.getDepartmentId() + "')";
         }
-        if (StringUtils.isNotBlank(param.getOperateDate()) && !"-1".equals(param.getOperateDate())) {
+        if (StringUtils.isNotBlank(param.getOperateDate()) && !"-1".equals(param.getOperateDate()) && !"0,,".equals(param.getOperateDate())) {
             if (!"6".equals(param.getOperateDate())) {
-                sqlWhere += " and create_time >= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "0") + " 00:00:00'";
-                sqlWhere += " and create_time <= '" + TimeUtil.getDateByOption(param.getOperateDate() + "", "") + " 23:59:59'";
+                sqlWhere += " and create_time >= '" + TimeUtil.getDateByOption(param.getOperateDate(), "0") + " 00:00:00'";
+                sqlWhere += " and create_time <= '" + TimeUtil.getDateByOption(param.getOperateDate(), "") + " 23:59:59'";
             } else {
                 if (StringUtils.isNotBlank(param.getStartDate())) {
                     sqlWhere += " and create_time >= '" + param.getStartDate() + "'";

src/com/engine/organization/thread/DepartmentTriggerRunnable.java

@@ -13,6 +13,7 @@ import com.engine.organization.util.OrganizationDateUtil;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections.CollectionUtils;
 import weaver.common.DateUtil;
+import weaver.general.Util;
 import weaver.hrm.passwordprotection.domain.HrmResource;
 
 import java.sql.Date;
@@ -55,7 +56,7 @@ public class DepartmentTriggerRunnable implements Runnable {
     }
 
     public DepartmentTriggerRunnable(Integer oldFparentId, Long departmentId) {
-        this.oldFparentId = oldFparentId.toString();
+        this.oldFparentId = null == oldFparentId ? null : oldFparentId.toString();
         this.newDepartment = MapperProxyFactory.getProxy(DepartmentMapper.class).getDeptById(departmentId);
     }
 
@@ -114,7 +115,7 @@ public class DepartmentTriggerRunnable implements Runnable {
             jclMap.setFDateEnd(new Date(OrganizationDateUtil.stringToDate("2099-12-31").getTime()));
 
             // 获取当前生效的本部门map记录
-            JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.departmentfielddefined.getValue().toString(), jclMap.getFObjId().toString());
+            JclOrgMap jclOrgMapByObjID = MapperProxyFactory.getProxy(JclOrgMapper.class).getJclOrgMapByObjID(currentDate, ModuleTypeEnum.departmentfielddefined.getValue().toString(), Util.null2String(jclMap.getFObjId()));
 
             // 取出以该部门为上级部门的在编、在岗数,转移无需计算
             JclOrgMap jclOrgMap = MapperProxyFactory.getProxy(JclOrgMapper.class).getSumPlanAndJobByFParentId(currentDate, jclMap.getId().toString());

src/com/engine/organization/util/RefreshIsUsedUtil.java

@@ -59,7 +59,6 @@ public class RefreshIsUsedUtil {
      */
     public static void RefreshGrade(String tableName) {
         List<String> usedIds = MapperProxyFactory.getProxy(GradeMapper.class).listUsedId();
-        //usedIds.forEach(System.out ::println);
         usedIds.removeIf(StringUtils::isBlank);
         RefreshIsUsedStatus(tableName, usedIds);
     }