diff --git a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java index 8318895..f015d33 100644 --- a/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java +++ b/casic-iris-register/src/main/java/com/casic/missiles/modular/register/controller/IrisPersonController.java @@ -121,13 +121,13 @@ try { person.setDelflag("0"); String photoData = person.getPhoto(); - if(ToolUtil.isNotEmpty(person.getPhoto())){ + if(ToolUtil.isNotEmpty(photoData)&&photoData.startsWith("data:image")){ String photoPath = fileService.saveFile(photoData); person.setPhoto(photoPath); person.setOprationId(permissionService.getCurrLoginUser().getId()); } irisPersonService.update(person); - if(ToolUtil.isNotEmpty(person.getPhoto())){ + if(ToolUtil.isNotEmpty(photoData)&&photoData.startsWith("data:image")){ IrisPersonPhoto personPhoto = iIrisPersonPhotoService.selectById(person.getId()); if(ToolUtil.isNotEmpty(personPhoto)){ personPhoto.setPhotoData(photoData); @@ -201,7 +201,7 @@ if (ToolUtil.isNotEmpty(keywords)) { query.andNew().like(PersonConst.TABLE_PERSONNAME, keywords).or().like(PersonConst.TABLE_CARDNO, keywords); } - query.eq(PersonConst.TABLE_DELFLAG, 0); + query.andNew().eq(PersonConst.TABLE_DELFLAG, 0); List> scopePersons = irisPersonService.selectDataScopePersonMap(defaultPage, scope, query); defaultPage.setRecords(scopePersons); query.orderBy(PersonConst.TABLE_PERSONCODE);