From 6df1accb9877d87421656e522c6938ab357f9601 Mon Sep 17 00:00:00 2001 From: dxfeng Date: Fri, 17 Jun 2022 16:54:16 +0800 Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BF=AE=E5=A4=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../extend/param/ExtendInfoFieldParam.java | 20 ++++++++++++++++++- .../mapper/extend/ExtendTitleMapper.xml | 4 ++-- .../service/FieldDefinedService.java | 4 ++-- .../service/impl/FieldDefinedServiceImpl.java | 14 ++++++++++--- .../web/FieldDefinedController.java | 2 +- .../wrapper/FieldDefinedWrapper.java | 4 ++-- 6 files changed, 37 insertions(+), 11 deletions(-) diff --git a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java index ca44f358..7e055d9c 100644 --- a/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java +++ b/src/com/engine/organization/entity/extend/param/ExtendInfoFieldParam.java @@ -7,6 +7,7 @@ import lombok.AllArgsConstructor; import lombok.Builder; import lombok.Data; import lombok.NoArgsConstructor; +import org.apache.commons.lang.StringUtils; import weaver.general.Util; /** @@ -37,7 +38,7 @@ public class ExtendInfoFieldParam { public String getControlType() { JSONArray fieldType = (JSONArray) this.getFieldType(); - String fieldHtmlType = Util.null2String(fieldType.get(0)).trim(); + String fieldHtmlType = Util.null2String(fieldType.get(0)); if (fieldHtmlType.equals("input")) { fieldHtmlType = "1"; } else if (fieldHtmlType.equals("textarea")) { @@ -109,4 +110,21 @@ public class ExtendInfoFieldParam { } return fp.getFielddbtype(); } + + public static String toDbc(String input) { + if (StringUtils.isBlank(input)) { + return ""; + } + char[] c = input.toCharArray(); + for (int i = 0; i < c.length; i++) { + if (c[i] == 12288) { + c[i] = (char) 32; + continue; + } + if (c[i] > 65280 && c[i] < 65375) { + c[i] = (char) (c[i] - 65248); + } + } + return new String(c); + } } \ No newline at end of file diff --git a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml index 2a72c9f0..62cff4b5 100644 --- a/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml +++ b/src/com/engine/organization/mapper/extend/ExtendTitleMapper.xml @@ -120,7 +120,7 @@ FROM jcl_field_extendtitle t - WHERE t.delete_type = 0 and t.is_show = 1 + WHERE t.delete_type = 0 and group_id = #{groupId} @@ -132,7 +132,7 @@ FROM jcl_field_extendtitle t - WHERE t.delete_type = 0 and t.is_show = 1 + WHERE t.delete_type = 0 AND id IN #{id} diff --git a/src/com/engine/organization/service/FieldDefinedService.java b/src/com/engine/organization/service/FieldDefinedService.java index 643207a9..381e74f0 100644 --- a/src/com/engine/organization/service/FieldDefinedService.java +++ b/src/com/engine/organization/service/FieldDefinedService.java @@ -73,10 +73,10 @@ public interface FieldDefinedService { /** * 删除标题信息 * - * @param id + * @param param * @return */ - int deleteTitle(Long id); + int deleteTitle(ExtendTitleSaveParam param); /** * 获取自定义字段列表 diff --git a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java index 158d3ed9..45f53f4c 100644 --- a/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java +++ b/src/com/engine/organization/service/impl/FieldDefinedServiceImpl.java @@ -214,8 +214,16 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ } @Override - public int deleteTitle(Long id) { - return getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(id.toString()).build().getIds()); + public int deleteTitle(ExtendTitleSaveParam param) { + getExtendTitleMapper().deleteExtendTitleByIds(DeleteParam.builder().ids(param.getId().toString()).build().getIds()); + List titlesByGroupID = getExtendTitleMapper().getTitlesByGroupID(param.getGroupType()); + + if (CollectionUtils.isEmpty(titlesByGroupID)) { + // 删除整个分组 + getExtendGroupMapper().delete(param.getGroupType()); + return 1; + } + return 0; } @Override @@ -432,7 +440,7 @@ public class FieldDefinedServiceImpl extends Service implements FieldDefinedServ MapperProxyFactory.getProxy(ExtendGroupMapper.class).delete(id); List extendInfoList = getExtendInfoMapper().listFields(extendGroupPO.getExtendType().toString(), extendGroupPO.getId().toString(), ExtendGroupBO.getTableNameByGroupPO(extendGroupPO), ""); List ids = extendInfoList.stream().map(ExtendInfoPO::getId).collect(Collectors.toList()); - if(CollectionUtils.isNotEmpty(ids)) { + if (CollectionUtils.isNotEmpty(ids)) { // 删除数据 dropColumns(ids, extendGroupPO, extendInfoList); } diff --git a/src/com/engine/organization/web/FieldDefinedController.java b/src/com/engine/organization/web/FieldDefinedController.java index 491e0111..0593b217 100644 --- a/src/com/engine/organization/web/FieldDefinedController.java +++ b/src/com/engine/organization/web/FieldDefinedController.java @@ -144,7 +144,7 @@ public class FieldDefinedController { public ReturnResult deleteTitle(@Context HttpServletRequest request, @Context HttpServletResponse response, @PathParam("moduleTypeEnum") ModuleTypeEnum moduleTypeEnum, @RequestBody ExtendTitleSaveParam param) { try { User user = HrmUserVarify.getUser(request, response); - return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param.getId())); + return ReturnResult.successed(getFieldDefinedWrapper(user).deleteTitle(param)); } catch (Exception e) { return ReturnResult.exceptionHandle(e.getMessage()); } diff --git a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java index ee0060a6..cfa351f6 100644 --- a/src/com/engine/organization/wrapper/FieldDefinedWrapper.java +++ b/src/com/engine/organization/wrapper/FieldDefinedWrapper.java @@ -70,8 +70,8 @@ public class FieldDefinedWrapper extends Service { } - public int deleteTitle(Long id) { - return getFieldDefinedService(user).deleteTitle(id); + public int deleteTitle(ExtendTitleSaveParam param) { + return getFieldDefinedService(user).deleteTitle(param); }