diff --git a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml index a87b3fc8..8ddf3310 100644 --- a/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml +++ b/src/com/engine/organization/mapper/personnelcard/CardAccessMapper.xml @@ -106,8 +106,9 @@ - - + + select JCL_ORG_CARDACCESS_ID.currval from dual INSERT INTO jcl_org_cardaccess @@ -218,7 +219,7 @@ - when id=#{item.id} then #{item.custom} + when id=#{item.id} then #{item.custom} @@ -235,6 +236,50 @@ + + 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} + + + update_time=now(), + + where + + id=#{item.id} + + + UPDATE jcl_org_cardaccess SET delete_type = 1 diff --git a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml index 737e5029..3343baf8 100644 --- a/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml +++ b/src/com/engine/organization/mapper/resource/JclOrgCustomTemplateMapper.xml @@ -40,11 +40,11 @@ insert into jcl_org_custom_template - ( id,name,basic_fields + (name,basic_fields ,personal_fields,work_fields,isused ,creator,create_time,update_time ) - values (#{id,jdbcType=INTEGER},#{name,jdbcType=VARCHAR},#{basicFields,jdbcType=VARCHAR} + values (#{name,jdbcType=VARCHAR},#{basicFields,jdbcType=VARCHAR} ,#{personalFields,jdbcType=VARCHAR},#{workFields,jdbcType=VARCHAR},#{isused,jdbcType=INTEGER} ,#{creator,jdbcType=INTEGER},#{createTime,jdbcType=DATE},#{updateTime,jdbcType=DATE} ) diff --git a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java index c36c1d84..bb319272 100644 --- a/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java +++ b/src/com/engine/organization/service/impl/HrmPersonnelCardServiceImpl.java @@ -285,10 +285,10 @@ public class HrmPersonnelCardServiceImpl extends Service implements HrmPersonnel List cardButtonPOS = getCardButtonMapper().listEnableButton(); List buttonList = new ArrayList<>(); HrmCommonService hrmCommonService = new HrmCommonServiceImpl(); - List roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(user.getUID()).split(","))); for (CardButtonPO cardButton : cardButtonPOS) { + List roleIds = new ArrayList<>(Arrays.asList(hrmCommonService.getRoleIds(user.getUID()).split(","))); List accessRoleIds = new ArrayList<>(Arrays.asList(Util.null2String(cardButton.getRoles()).split(","))); roleIds.retainAll(accessRoleIds); if (isAdmin || (isMySelf && "0".equals(cardButton.getSysDefault())) || CollectionUtils.isNotEmpty(roleIds)) {