diff --git a/docs/表结构SQL/MySQL.sql b/docs/表结构SQL/MySQL.sql index 2ec98e4d..e203c978 100644 --- a/docs/表结构SQL/MySQL.sql +++ b/docs/表结构SQL/MySQL.sql @@ -570,10 +570,25 @@ create table JCL_ORG_CARDACCESS ( all_people int null, superior int null, all_superior int null, - custom text null , + custom varchar(2000) null , delete_type int null, creator int null, create_time date null, update_time date null, constraint JCL_ORG_CARDACCESS_PK primary key (id) +); + +-- JCL_ORG_CARDBUTTON +create table JCL_ORG_CARDBUTTON ( + id BIGINT auto_increment not null, + name varchar(255) not null, + status int null, + url varchar(255) null, + role varchar(2000) null, + defaults int not null, + creator int null, + delete_type int null, + create_time date null, + update_time date null, + constraint JCL_ORG_CARDBUTTON_PK primary key (id) ); \ No newline at end of file diff --git a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java index c2ccb863..fd2b043a 100644 --- a/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java +++ b/src/com/engine/organization/entity/personnelcard/vo/CardAccessVO.java @@ -55,7 +55,7 @@ public class CardAccessVO { @OrganizationTableColumn(text = "所有上级可见", width = "15%", column = "all_superior") private Integer allSuperior; - @OrganizationTableColumn(text = "查看自定义", width = "15%", column = "custom",transmethod = "com.engine.organization.transmethod.ManagerDetachTransMethod.getRoleLevel") + @OrganizationTableColumn(text = "查看自定义", width = "15%", column = "custom",transmethod = "com.engine.organization.transmethod.SystemTransMethod.getRoleName") private String custom; } diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java index 77719953..55620170 100644 --- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java +++ b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.java @@ -19,7 +19,7 @@ public interface CardAccessMapper { int insertIgnoreNull(CardAccessPO cardAccessPO); - int saveCardAccess(@Param("dataList") List> dataList); + int saveCardAccess(@Param("dataList") List dataList); int deleteByIds(@Param("ids") Collection ids); diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml index 2f751b30..5488d10e 100644 --- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml +++ b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml @@ -42,7 +42,7 @@ type_id, - + type_name, @@ -77,7 +77,7 @@ #{typeId}, - + #{typeName}, @@ -119,7 +119,7 @@ type_id, - + type_name, @@ -154,7 +154,7 @@ #{typeId}, - + #{typeName}, @@ -189,30 +189,53 @@ - - - update jcl_org_cardaccess - - - status = #{item.status}, - - - all_people = #{item.allPeople}, - - - superior = #{item.superior}, - - - all_superior = #{item.allSuperior}, - - - custom = #{item.custom}, - - - update_time = #{item.updateTime} - - - where id = #{item.id} + + update jcl_org_cardaccess + + + + + when id=#{item.id} then #{item.status} + + + + + + + when id=#{item.id} then #{item.allPeople} + + + + + + + when id=#{item.id} then #{item.superior} + + + + + + + when id=#{item.id} then #{item.allSuperior} + + + + + + when id=#{item.id} then #{item.custom} + + + + + + when id=#{item.id} then #{item.updateTime} + + + + + where + + id=#{item.id} diff --git a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java index 51ab0c7d..08adb39d 100644 --- a/src/com/engine/organization/service/impl/CardAccessServiceImpl.java +++ b/src/com/engine/organization/service/impl/CardAccessServiceImpl.java @@ -54,16 +54,17 @@ public class CardAccessServiceImpl extends Service implements CardAccessService @Override public int save(Map params) { int rowNum = Util.getIntValue((String) params.get("rownum")); - List> dataList = new ArrayList<>(); + List dataList = new ArrayList<>(); for (int i = 0; i < rowNum; i++) { - HashMap data = new HashMap<>(); - data.put("id",params.get("id_"+i)); - data.put("status",params.get("status_"+i)); - data.put("allPeople",params.get("all_people_"+i)); - data.put("superior",params.get("superior_"+i)); - data.put("allSuperior",params.get("all_superior_"+i)); - data.put("custom",params.get("custom"+i)); - data.put("updateTime",new Date()); + CardAccessPO data = CardAccessPO.builder() + .id(Util.getIntValue((String)params.get("id_"+i))) + .status(Util.getIntValue((String)params.get("status_"+i))) + .allPeople(Util.getIntValue((String)params.get("all_people_"+i))) + .superior(Util.getIntValue((String)params.get("superior_"+i))) + .allSuperior(Util.getIntValue((String)params.get("all_superior_"+i))) + .custom(Util.null2String(params.get("custom_"+i))) + .updateTime(new Date()) + .build(); dataList.add(data); } return getCardAccessMapper().saveCardAccess(dataList); diff --git a/src/com/engine/organization/transmethod/SystemTransMethod.java b/src/com/engine/organization/transmethod/SystemTransMethod.java new file mode 100644 index 00000000..314b2547 --- /dev/null +++ b/src/com/engine/organization/transmethod/SystemTransMethod.java @@ -0,0 +1,28 @@ +package com.engine.organization.transmethod; + +import org.apache.commons.lang3.StringUtils; +import weaver.hrm.roles.RolesComInfo; + +import java.util.ArrayList; +import java.util.List; + +/** + * @Author weaver_cl + * @Description: + * @Date 2022/11/9 + * @Version V1.0 + **/ +public class SystemTransMethod { + + public static String getRoleName(String roleIds) { + RolesComInfo rolesComInfo = new RolesComInfo(); + List list = new ArrayList<>(); + if (StringUtils.isNotBlank(roleIds)) { + for (String roleId : roleIds.split(",")) { + list.add(rolesComInfo.getRolesname(roleId)); + } + } + return StringUtils.join(list,","); + } + +}