Merge branch 'develop' of http://221.226.25.34:3000/liang.cheng/weaver-hrm-organization into feature/cl

src/com/engine/organization/common/IgnoreCaseMap.java

@@ -0,0 +1,25 @@
+package com.engine.organization.common;
+
+import java.util.HashMap;
+
+/**
+ * @author:dxfeng
+ * @createTime: 2024/07/11
+ * @version: 1.0
+ */
+public class IgnoreCaseMap<V> extends HashMap<String, V> {
+    @Override
+    public V get(Object key) {
+        if (key instanceof String) {
+            // 将键转为小写形式再进行查找
+            return super.get(((String) key).toLowerCase());
+        }
+        return null;
+    }
+
+    @Override
+    public V put(String key, V value) {
+        // 将键转为小写形式后作为真正的键
+        return super.put(key.toLowerCase(), value);
+    }
+}

src/com/engine/organization/entity/extend/bo/ExtendInfoBO.java

@@ -583,7 +583,7 @@ public class ExtendInfoBO {
                 }
 
                 if (Util.null2String(extendInfoPO.getFieldNameDesc()).length() > 0) {
-                    searchConditionItem.setLabel(extendInfoPO.getFieldNameDesc());
+                    searchConditionItem.setLabel(Util.formatMultiLang(extendInfoPO.getFieldNameDesc()));
                 }
 
             }

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

@@ -4,6 +4,7 @@ import com.api.browser.bean.SearchConditionItem;
 import com.engine.common.service.HrmCommonService;
 import com.engine.common.service.impl.HrmCommonServiceImpl;
 import com.engine.core.impl.Service;
+import com.engine.organization.common.IgnoreCaseMap;
 import com.engine.organization.entity.TopTab;
 import com.engine.organization.entity.codesetting.po.CodeRulePO;
 import com.engine.organization.entity.extend.ExtendInfoOperateType;
@@ -19,7 +20,6 @@ import com.engine.organization.mapper.extend.*;
 import com.engine.organization.mapper.personnelcard.CardButtonMapper;
 import com.engine.organization.service.ExtService;
 import com.engine.organization.util.OrganizationAssert;
-import com.engine.organization.util.db.DBType;
 import com.engine.organization.util.db.MapperProxyFactory;
 import org.apache.commons.collections4.CollectionUtils;
 import org.apache.commons.lang3.StringUtils;
@@ -85,9 +85,15 @@ public class ExtServiceImpl extends Service implements ExtService {
 
         ExtendInfoParams infoParams = ExtendInfoParams.builder().tableName(tableName).fields(fields).params(null).id(id).build();
         Map<String, Object> compExtMap = getExtMapper().listExt(infoParams);
+        IgnoreCaseMap<Object> ignoreCaseMap = new IgnoreCaseMap<>();
+        if (null != compExtMap) {
+            for (Map.Entry<String, Object> entry : compExtMap.entrySet()) {
+                ignoreCaseMap.put(entry.getKey(), entry.getValue());
+            }
+        }
         // 组装拓展页内容
         for (ExtendInfoPO extendInfoPO : infoPOList) {
-            SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, null == compExtMap ? null : compExtMap.get(DBType.isOracle() ? extendInfoPO.getFieldName().toUpperCase() : extendInfoPO.getFieldName()));
+            SearchConditionItem item = ExtendInfoBO.getSearchConditionItem(user, viewAttr, extendInfoPO, ignoreCaseMap.get(extendInfoPO.getFieldName()));
             item.setFieldcol(16);
             if (2 == viewAttr) {
                 if (CollectionUtils.isNotEmpty(readOnlyFieldList) && readOnlyFieldList.contains(extendInfoPO.getFieldName())) {

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

@@ -297,7 +297,7 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel
             List<String> accessRoleIds = new ArrayList<>(Arrays.asList(Util.null2String(cardButton.getRoles()).split(",")));
             roleIds.retainAll(accessRoleIds);
             if (isAdmin || (isMySelf && "0".equals(cardButton.getSysDefault())) || CollectionUtils.isNotEmpty(roleIds)) {
-                buttonList.add(CardButtonPO.builder().name(cardButton.getName()).url(cardButton.getUrl()).sysDefault(cardButton.getSysDefault()).build());
+                buttonList.add(CardButtonPO.builder().name(Util.formatMultiLang(cardButton.getName())).url(cardButton.getUrl()).sysDefault(cardButton.getSysDefault()).build());
             }
         }
         return buttonList;

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

@@ -794,8 +794,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
 
         Map<Integer, DepartmentPO> departmentPOMap = getDepartmentMapper().listAll("showorder").stream().collect(Collectors.toMap(DepartmentPO::getId, item -> item));
         for (DepartmentPO departmentPO : filterDeparts) {
+            if (departmentPO.getCanceled() == null || departmentPO.getCanceled() == 0) {
                 buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
             }
+        }
         List<SearchTree> departmentList = DepartmentBO.buildSetToSearchTree(builderDeparts);
         List<SearchTree> deptTrees = SearchTreeUtil.builderTreeMode(departmentList);
         List<SearchTree> searchTrees = SearchTreeUtil.builderTreeMode(departmentList, jobTrees);
@@ -844,8 +846,10 @@ public class HrmResourceServiceImpl extends Service implements HrmResourceServic
         // 查询分部信息
         Set<DepartmentPO> builderDeparts = new HashSet<>();
         for (DepartmentPO departmentPO : filterDeparts) {
+            if (departmentPO.getCanceled() == null || departmentPO.getCanceled() == 0) {
                 buildParentDepts(departmentPO, builderDeparts, departmentPOMap);
             }
+        }
         return SearchTreeUtil.builderTreeMode(DepartmentBO.buildSetToSearchTree(builderDeparts), jobTrees);
     }
 

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

@@ -289,7 +289,7 @@ public class JobServiceImpl extends Service implements JobService {
                         }
 
                     }
-                    addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
+                    addGroups.add(new SearchConditionGroup(Util.formatMultiLang(extendTitle.getTitle()), true, items));
                 }
             }
         }
@@ -319,7 +319,7 @@ public class JobServiceImpl extends Service implements JobService {
             for (ExtendTitlePO extendTitle : extendTitles) {
                 List<SearchConditionItem> items = getExtService(user).getExtForm(user, EXTEND_TYPE + "", GROUP_ID.equals(Long.parseLong(groupId)) ? JCL_ORG_JOB : JCL_ORG_JOBEXT, viewAttr, id, extendTitle.getId().toString(), "ec_jobTitle", "ec_department", "ec_company");
                 if (CollectionUtils.isNotEmpty(items)) {
-                    addGroups.add(new SearchConditionGroup(extendTitle.getTitle(), true, items));
+                    addGroups.add(new SearchConditionGroup(Util.formatMultiLang(extendTitle.getTitle()), true, items));
                 }
             }
         }