|
|
@@ -38,9 +38,9 @@ public class CardLog {
|
|
|
this.cl_emid = employee.getEm_id();
|
|
|
this.cl_emcode = employee.getEm_code();
|
|
|
this.cl_emname = employee.getEm_name();
|
|
|
- this.cl_address = data.getLocation_detail();
|
|
|
+ this.cl_address = StringUtils.hasText(data.getLocation_detail())?data.getLocation_detail().replaceAll("'",""):null;
|
|
|
this.cl_phone = employee.getEm_mobile();
|
|
|
- this.cl_location = data.getLocation_title();
|
|
|
+ this.cl_location = StringUtils.hasText(data.getLocation_title())?data.getLocation_title().replaceAll("'",""):null;
|
|
|
this.cl_groupname = data.getGroupname();
|
|
|
this.cl_checkintype = data.getCheckin_type();
|
|
|
this.cl_exceptiontype = data.getException_type();
|
|
|
@@ -59,9 +59,9 @@ public class CardLog {
|
|
|
this.cl_emid = employee.getEm_id();
|
|
|
this.cl_emcode = employee.getEm_code();
|
|
|
this.cl_emname = employee.getEm_name();
|
|
|
- this.cl_address = data.getDevice_name();
|
|
|
+ this.cl_address = (StringUtils.hasText(data.getDevice_name())?data.getDevice_name().replaceAll("'",""):null);
|
|
|
this.cl_phone = employee.getEm_mobile();
|
|
|
- this.cl_location = data.getDevice_name();
|
|
|
+ this.cl_location =(StringUtils.hasText(data.getDevice_name())?data.getDevice_name().replaceAll("'",""):null);
|
|
|
this.cl_groupname = "";
|
|
|
this.cl_checkintype ="";
|
|
|
this.cl_exceptiontype = "";
|