From b06d978a031ba9bb033b705842b9052235cc8ef1 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期四, 21 十二月 2023 15:34:24 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java | 44 +++++++++++++++------
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java | 4 +-
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java | 6 ++-
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java | 2
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java | 2
server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java | 4 +-
server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java | 39 +++++++++++--------
server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java | 6 +-
9 files changed, 68 insertions(+), 41 deletions(-)
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
index b143bea..fd69d04 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceController.java
@@ -76,7 +76,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:device:exportExcel")
+ //@RequiresPermissions("business:device:exportExcel")
public void exportExcel (@RequestBody PageWrap<Device> pageWrap, HttpServletResponse response) {
ExcelExporter.build(Device.class).export(deviceService.findPage(pageWrap).getRecords(), "璁惧淇℃伅琛�", response);
}
diff --git a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
index 84a2e00..fe0f82e 100644
--- a/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
+++ b/server/dmvisit_admin/src/main/java/com/doumee/api/business/DeviceRoleController.java
@@ -40,7 +40,7 @@
@ApiOperation("鏍规嵁ID鍒犻櫎")
@GetMapping("/delete/{id}")
- @RequiresPermissions("business:devicerole:delete")
+ //@RequiresPermissions("business:devicerole:delete")
public ApiResponse deleteById(@PathVariable Integer id) {
deviceRoleService.deleteById(id);
return ApiResponse.success(null);
@@ -48,7 +48,7 @@
@ApiOperation("鎵归噺鍒犻櫎")
@GetMapping("/delete/batch")
- @RequiresPermissions("business:devicerole:delete")
+ //@RequiresPermissions("business:devicerole:delete")
public ApiResponse deleteByIdInBatch(@RequestParam String ids) {
String [] idArray = ids.split(",");
List<Integer> idList = new ArrayList<>();
@@ -84,7 +84,7 @@
@ApiOperation("瀵煎嚭Excel")
@PostMapping("/exportExcel")
- @RequiresPermissions("business:devicerole:exportExcel")
+ //@RequiresPermissions("business:devicerole:exportExcel")
public void exportExcel (@RequestBody PageWrap<DeviceRole> pageWrap, HttpServletResponse response) {
ExcelExporter.build(DeviceRole.class).export(deviceRoleService.findPage(pageWrap).getRecords(), "闂ㄧ瑙掕壊淇℃伅琛�", response);
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java
index 0c36a60..1eeb901 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/CarEventListRequest.java
@@ -10,10 +10,10 @@
* @date 2023/11/23 14:03
*/
@Data
-@ApiModel("闂ㄧ鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
+@ApiModel("杞﹁締鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
public class CarEventListRequest extends BaseRequst {
@ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
- private Integer eventId;
+ private String eventId;
@ApiModelProperty(value = "鍋滆溅搴撶紪鐮侊紙璁垮绔疘D锛�" )
private String parkId;
@ApiModelProperty(value = "鍋滆溅搴撳悕绉帮紝鏀寔妯＄硦鏌ヨ" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java
index 4807f2d..575b101 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/request/DoorEventListRequest.java
@@ -12,8 +12,8 @@
@Data
@ApiModel("闂ㄧ鍑哄叆浜嬩欢鍚屾璇锋眰淇℃伅")
public class DoorEventListRequest extends BaseRequst {
- @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
- private Integer eventId;
+ @ApiModelProperty(value = "鍞竴鏍囪瘑")
+ private String eventId;
@ApiModelProperty(value = "濮撳悕,鏀寔妯＄硦鍖归厤" )
private String name;
@ApiModelProperty(value = "韬唤璇佸彿" )
diff --git a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java
index 4f4a60e..4cf8866 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/core/erp/model/openapi/response/CarEventListResponse.java
@@ -13,8 +13,8 @@
@ApiModel("杞﹁締鍑哄叆浜嬩欢鍚屾杩斿洖淇℃伅")
public class CarEventListResponse {
- @ApiModelProperty(value = "鍞竴鏍囪瘑" ,example = "1")
- private Integer eventId;
+ @ApiModelProperty(value = "鍞竴鏍囪瘑" )
+ private String eventId;
@ApiModelProperty(value = "杩涘嚭鍦虹被鍨嬶紝0锛氳繘鍦猴紝1锛氬嚭鍦�" )
private Integer inoutType;
@@ -61,5 +61,7 @@
private String subLogo;
@ApiModelProperty(value = "瀛愬搧鐗屽勾娆�")
private Integer subModel;
+ @ApiModelProperty(value = "浜х敓鏃堕棿" )
+ private String createTime ;
}
diff --git a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
index 8d31b83..dd2046a 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/dao/business/model/DeviceRole.java
@@ -62,7 +62,7 @@
@ApiModelProperty(value = "绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
@ExcelColumn(name="绫诲瀷 0鍔冲姟璁垮 1鏅�氳瀹� 2鍐呴儴浜哄憳")
- private Integer type;
+ private String type;
@ApiModelProperty(value = "鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
@ExcelColumn(name="鍙娇鐢ㄩ棬绂佺紪鐮侀泦鍚堬紝澶氫釜鑻辨枃閫楀彿闅斿紑")
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
index b802f7d..e14ae63 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/DeviceRoleServiceImpl.java
@@ -56,8 +56,8 @@
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
if(null != newDeviceRole) {
@@ -66,8 +66,7 @@
updateDeviceRole.setId(newDeviceRole.getId());
updateDeviceRole.setEdirot(loginUserInfo.getId().toString());
updateDeviceRole.setEditDate(new Date());
- updateDeviceRole.setIsdeleted(Constants.ONE);
- updateDeviceRole.setStatus(Constants.ZERO);
+ updateDeviceRole.setIsDefault(Constants.ONE);
deviceRoleMapper.updateById(updateDeviceRole);
}
DeviceRole insert = new DeviceRole();
@@ -78,7 +77,7 @@
insert.setIsdeleted(Constants.ZERO);
insert.setRemark(deviceRole.getRemark());
insert.setName(deviceRole.getName());
- insert.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
+ insert.setIsDefault(deviceRole.getIsDefault());
insert.setType(deviceRole.getType());
insert.setDoorIds(deviceRole.getDoorIds());
insert.setDoorNames(deviceRole.getDoorNames());
@@ -114,7 +113,19 @@
@Override
public void updateById(DeviceRole deviceRole) {
- deviceRole.setIsDefault(Constants.equalsInteger(Constants.ONE,deviceRole.getStatus()) ? 0 : 1);
+ DeviceRole newDeviceRole = null;
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
+ }
+ LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
+ if(null != newDeviceRole) {
+ DeviceRole update = new DeviceRole();
+ update.setEdirot(loginUserInfo.getId().toString());
+ update.setEditDate(new Date());
+ update.setId(newDeviceRole.getId());
+ update.setIsDefault(Constants.ONE);
+ deviceRoleMapper.updateById(update);
+ }
deviceRoleMapper.updateById(deviceRole);
}
@@ -122,8 +133,8 @@
public void updateStatusById(DeviceRole deviceRole) {
// 鑾峰彇涔嬪墠鏄惁瀛樺湪榛樿闂ㄧ缁�
DeviceRole newDeviceRole = null;
- if(Constants.ONE == deviceRole.getStatus() && null != deviceRole.getType()) {
- newDeviceRole = getDeviceRole(deviceRole.getStatus(), deviceRole.getType());
+ if(null != deviceRole.getType()) {
+ newDeviceRole = getDeviceRole(deviceRole.getType());
}
LoginUserInfo loginUserInfo = (LoginUserInfo)SecurityUtils.getSubject().getPrincipal();
List<DeviceRole> deviceRoleList = new ArrayList<>();
@@ -149,12 +160,11 @@
}
}
- private DeviceRole getDeviceRole(Integer status, Integer type) {
+ private DeviceRole getDeviceRole(String type) {
LambdaQueryWrapper<DeviceRole> query = new LambdaQueryWrapper<>();
query.eq(DeviceRole::getIsdeleted,Constants.ZERO)
.eq(DeviceRole::getIsDefault,Constants.ZERO)
- .eq(DeviceRole::getType,type)
- .eq(DeviceRole::getStatus,status);
+ .eq(DeviceRole::getType,type);
// 鏌ヨ鏄惁鏈夐粯璁ら棬绂佺粍锛屽彧鑳芥湁涓�缁勯粯璁ら棬绂佺粍
DeviceRole getDeviceRole = deviceRoleMapper.selectOne(query);
return getDeviceRole;
@@ -221,8 +231,16 @@
if (pageWrap.getModel().getIsDefault() != null) {
queryWrapper.lambda().eq(DeviceRole::getIsDefault, pageWrap.getModel().getIsDefault());
}
- if (pageWrap.getModel().getType() != null) {
- queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
+ if (StringUtils.isNotBlank(pageWrap.getModel().getType())) {
+ if(pageWrap.getModel().getType().length() > 1) {
+ String[] types = pageWrap.getModel().getType().split(",");
+ queryWrapper.lambda()
+ .eq(DeviceRole::getType, types[0])
+ .or()
+ .eq(DeviceRole::getType, types[1]);
+ }else {
+ queryWrapper.lambda().eq(DeviceRole::getType, pageWrap.getModel().getType());
+ }
}
if (pageWrap.getModel().getDoorIds() != null) {
queryWrapper.lambda().eq(DeviceRole::getDoorIds, pageWrap.getModel().getDoorIds());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
index 659322e..f1ecd22 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/erp/ErpSyncServiceImpl.java
@@ -421,7 +421,7 @@
try{
String erpAccessKey = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_KEY).getCode();
String erpAccessSecret = systemDictDataBiz.queryByCode(Constants.ERP_CONFIG,Constants.ERP_ACCESS_SECRET).getCode();
- if(!accessKey.equals(erpAccessKey)||!erpAccessSecret.equals(accessSecret)){
+ if(!(accessKey.equals(erpAccessKey)&&erpAccessSecret.equals(accessSecret))){
throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),"绉橀挜鍖归厤澶辫触");
}
JwtPayLoad payLoad = new JwtPayLoad(erpAccessKey+"-"+erpAccessSecret);
@@ -429,8 +429,9 @@
RedisUtil.addObject(redisTemplate,Constants.RedisKeys.ERP_TOKEN,token,Constants.RedisKeys.EXPIRE_TIME);
result.setToken(token);
result.setExpireTime(Constants.RedisKeys.EXPIRE_TIME);
- }catch (Exception e){
-
+ return result;
+ }catch (BusinessException e ){
+ throw new BusinessException(ResponseStatus.NOT_ALLOWED.getCode(),e.getMessage());
}finally {
Map<String,String> param = new HashMap<>();
param.put("accessKey",accessKey);
@@ -438,8 +439,6 @@
saveInterfaceLog(param,"/visitBiz/accesstoken",JSONObject.toJSONString(result),Constants.ZERO);
}
-
- return result;
}
/**
@@ -541,12 +540,19 @@
queryWrapper.selectAll(VisitEvent.class);
queryWrapper.selectAs(Visits::getName, VisitEventListResponse::getVisitorName);
+ queryWrapper.selectAs(VisitEvent::getBeVisitedPersonName, VisitEventListResponse::getBeVisitedUserName);
+ queryWrapper.selectAs(VisitEvent::getBeVisitedPersonOrg, VisitEventListResponse::getBeVisitedUserOrg);
+ queryWrapper.selectAs(VisitEvent::getSex, VisitEventListResponse::getVisitorSex);
+ queryWrapper.selectAs(VisitEvent::getVisitorWorkUint, VisitEventListResponse::getVisitorWorkUint);
+
queryWrapper.leftJoin(Visits.class,Visits::getId,VisitEvent::getVisitorId);
if(!Objects.isNull(visitListRequest)){
queryWrapper.eq(!Objects.isNull(visitListRequest.getEventId()),VisitEvent::getEventId, visitListRequest.getEventId());
queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorName()),Visits::getName, visitListRequest.getVisitorName());
- queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),VisitEvent::getIdNo, visitListRequest.getIdNo());
+
+ queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getIdNo()),Visits::getIdcardNo, DESUtil.encrypt(Constants.EDS_PWD, visitListRequest.getIdNo()) );
+
queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonId()),VisitEvent::getBeVisitedPersonId, visitListRequest.getBeVisitedPersonId());
queryWrapper.eq(StringUtils.isNotBlank(visitListRequest.getBeVisitedPersonOrgId()),VisitEvent::getBeVisitedPersonOrgId, visitListRequest.getBeVisitedPersonOrgId());
queryWrapper.like(StringUtils.isNotBlank(visitListRequest.getVisitorWorkUint()),VisitEvent::getVisitorWorkUint, visitListRequest.getVisitorWorkUint());
@@ -584,11 +590,11 @@
Utils.MP.blankToNull(doorEventListRequest);
queryWrapper.selectAs(DeviceEvent::getEventId,DoorEventListResponse::getEventId);
queryWrapper.selectAs(DeviceEvent::getEventType,DoorEventListResponse::getEventType);
- queryWrapper.selectAs(DeviceEvent::getSex,DoorEventListResponse::getSex);
+ queryWrapper.selectAs(Member::getSex,DoorEventListResponse::getSex);
queryWrapper.selectAs(DeviceEvent::getSrcName,DoorEventListResponse::getSrcName);
queryWrapper.selectAs(DeviceEvent::getSrcType,DoorEventListResponse::getSrcType);
- queryWrapper.selectAs(DeviceEvent::getIdcardDecode,DoorEventListResponse::getIdcardNo);
- queryWrapper.selectAs(DeviceEvent::getName,DoorEventListResponse::getName);
+ queryWrapper.selectAs(Member::getIdcardDecode,DoorEventListResponse::getIdcardNo);
+ queryWrapper.selectAs(Member::getName,DoorEventListResponse::getName);
queryWrapper.selectAs(DeviceEvent::getUserType,DoorEventListResponse::getType);
queryWrapper.selectAs(DeviceEvent::getExtEventInOut,DoorEventListResponse::getEventInOut);
queryWrapper.selectAs(DeviceEvent::getExtAccessChannel,DoorEventListResponse::getExtAccessChannel);
@@ -600,14 +606,14 @@
if(!Objects.isNull(doorEventListRequest)){
queryWrapper.eq(!Objects.isNull(doorEventListRequest.getEventId()),DeviceEvent::getEventId, doorEventListRequest.getEventId());
- queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),DeviceEvent::getName, doorEventListRequest.getName());
+ queryWrapper.like(StringUtils.isNotBlank(doorEventListRequest.getName()),Member::getName, doorEventListRequest.getName());
if(StringUtils.isNotBlank(doorEventListRequest.getIdNo())){
//杩涜鍔犲瘑
String encryptIdNo = DESUtil.encrypt(Constants.EDS_PWD,doorEventListRequest.getIdNo());
- queryWrapper.eq(DeviceEvent::getIdNum, encryptIdNo);
+ queryWrapper.eq(Member::getIdcardNo, encryptIdNo);
}
- queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getHappenTime, doorEventListRequest.getStartTime());
- queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getHappenTime, doorEventListRequest.getEndTime());
+ queryWrapper.ge(StringUtils.isNotBlank(doorEventListRequest.getStartTime()),DeviceEvent::getCreateDate, doorEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(doorEventListRequest.getEndTime()),DeviceEvent::getCreateDate, doorEventListRequest.getEndTime());
for(PageWrap.SortData sortData: param.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
@@ -638,7 +644,8 @@
Utils.MP.blankToNull(carEventListRequest);
queryWrapper.selectAs(CarEvent::getEventId,CarEventListResponse::getEventId);
queryWrapper.selectAs(CarEvent::getEventType,CarEventListResponse::getEventType);
- queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getEventType);
+ queryWrapper.selectAs(CarEvent::getCreateDate,CarEventListResponse::getCreateTime);
+ queryWrapper.selectAs(CarEvent::getInoutType,CarEventListResponse::getInoutType);
queryWrapper.selectAs(CarEvent::getAlarmCar,CarEventListResponse::getAlarmCar);
queryWrapper.selectAs(CarEvent::getCarAttributeName,CarEventListResponse::getCarAttributeName);
queryWrapper.selectAs(CarEvent::getCardNo,CarEventListResponse::getCardNo);
@@ -662,8 +669,8 @@
queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getParkId()),CarEvent::getParkIndex, carEventListRequest.getParkId());
queryWrapper.like(StringUtils.isNotBlank(carEventListRequest.getParkName()),CarEvent::getParkName, carEventListRequest.getParkName());
queryWrapper.eq(StringUtils.isNotBlank(carEventListRequest.getPlateNo()),CarEvent::getPlateNos, carEventListRequest.getPlateNo());
- queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getHappenTime, carEventListRequest.getStartTime());
- queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getHappenTime, carEventListRequest.getEndTime());
+ queryWrapper.ge(StringUtils.isNotBlank(carEventListRequest.getStartTime()),CarEvent::getCreateDate, carEventListRequest.getStartTime());
+ queryWrapper.le(StringUtils.isNotBlank(carEventListRequest.getEndTime()),CarEvent::getCreateDate, carEventListRequest.getEndTime());
for(PageWrap.SortData sortData: param.getSorts()) {
if (sortData.getDirection().equalsIgnoreCase(PageWrap.DESC)) {
queryWrapper.orderByDesc(sortData.getProperty());
diff --git a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
index c8c8824..2459aa6 100644
--- a/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
+++ b/server/dmvisit_service/src/main/java/com/doumee/service/business/impl/hksync/HkSyncPrivilegeServiceImpl.java
@@ -143,7 +143,7 @@
model.setHkStatus(Constants.ONE);
model.setIsdeleted(Constants.ONE);
model.setIsDefault(device.getIsDefault());
- model.setType(Constants.ZERO);
+ model.setType(String.valueOf(Constants.ZERO));
return model;
}
--
Gitblit v1.9.3