liang.cheng
/
weaver-hrm-organization
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

处理代码冲突

This commit is contained in:
dxfeng 2022-06-15 18:12:53 +08:00
parent 3f151d55e6
commit 70de6bbbd7
2 changed files with 26 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
src/com/engine/organization/service/FieldDefinedService.java
View File

@ -65,6 +65,20 @@ public interface FieldDefinedService {
* @return
*/
void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam);
/**
* 删除标题信息
*
* @param param
* @return
*/
int deleteTitle(ExtendTitleSaveParam param);
/**
* 获取自定义字段列表
*
* @param param
* @return
*/
Map<String, Object> getFieldDefinedInfo(ExtendTitleSaveParam param);
}

13
src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java
View File

@ -21,7 +21,6 @@ import com.engine.organization.util.OrganizationAssert;
import com.engine.organization.util.db.MapperProxyFactory;
import org.apache.commons.collections.CollectionUtils;
import org.apache.commons.lang.StringUtils;
import weaver.general.Util;
import java.util.*;
import java.util.stream.Collectors;
@ -164,6 +163,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
return datas;
}
@Override
public void changeTree(ModuleTypeEnum moduleTypeEnum, FieldTypeTreeParam fieldTypeTreeParam) {
if (fieldTypeTreeParam.getId() == null) {
ExtendGroupPO extendGroupPO = buildExtendGroupType(moduleTypeEnum, fieldTypeTreeParam);
@ -176,6 +176,17 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ
}
}
@Override
public int deleteTitle(ExtendTitleSaveParam param) {
int countFields = getExtendInfoMapper().countFieldsByGroupId(param.getGroupType());
OrganizationAssert.isTrue(countFields == 0, "当前分组下仍有字段信息，请删除字段信息后删除分组");
return getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(param.getId().toString()).build().getIds());
}
@Override
public Map<String, Object> getFieldDefinedInfo(ExtendTitleSaveParam param) {
return null;
}
private ExtendTitlePO buildExtendTitleType(ExtendGroupPO extendGroupPO) {
return ExtendTitlePO.builder()