Browse Source

Merge branch 'dev-customerfunction' into dev_temp

dev_shibei_match
zhangyongzhangyong 4 years ago
parent
commit
f1e8a8680e
  1. 2
      epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java
  2. 3
      epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java

2
epmet-module/gov-access/gov-access-client/src/main/java/com/epmet/dto/form/MenuConfigFormDTO.java

@ -21,7 +21,7 @@ public class MenuConfigFormDTO implements Serializable {
/** /**
* 客户id 列表 * 客户id 列表
* 列表为空则所有客户都不配置这个菜单了
*/ */
@NotBlank(message = "客户id 列表不能为空")
private List<String> customerIds; private List<String> customerIds;
} }

3
epmet-module/gov-access/gov-access-server/src/main/java/com/epmet/service/impl/GovCustomerMenuServiceImpl.java

@ -106,9 +106,8 @@ public class GovCustomerMenuServiceImpl extends BaseServiceImpl<GovCustomerMenuD
@Override @Override
public void saveCustomerMenu(MenuConfigFormDTO formDTO) { public void saveCustomerMenu(MenuConfigFormDTO formDTO) {
if (NumConstant.ZERO < formDTO.getCustomerIds().size()) {
baseDao.deleteBatchTableIds(formDTO.getTableId()); baseDao.deleteBatchTableIds(formDTO.getTableId());
if (NumConstant.ZERO < formDTO.getCustomerIds().size()) {
List<GovCustomerMenuEntity> entities = new ArrayList<>(); List<GovCustomerMenuEntity> entities = new ArrayList<>();
for (String customerId : formDTO.getCustomerIds()) { for (String customerId : formDTO.getCustomerIds()) {
GovCustomerMenuEntity entity = new GovCustomerMenuEntity(); GovCustomerMenuEntity entity = new GovCustomerMenuEntity();

Loading…
Cancel
Save