zdsong 1 週間 前
コミット
8f7413fa05

+ 0 - 2
farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/domain/entity/MastFarmer.java

@@ -1,6 +1,5 @@
 package jp.yamoto.farm.crm.biz.master.domain.entity;
 package jp.yamoto.farm.crm.biz.master.domain.entity;
 
 
-import jp.yamoto.farm.common.annotation.DecryptField;
 import jp.yamoto.farm.common.core.domain.BaseEntity;
 import jp.yamoto.farm.common.core.domain.BaseEntity;
 import lombok.Data;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.EqualsAndHashCode;
@@ -42,7 +41,6 @@ public class MastFarmer extends BaseEntity {
     /**
     /**
      * 電話番号
      * 電話番号
      */
      */
-    @DecryptField
     private String phoneNumber;
     private String phoneNumber;
 
 
     /**
     /**

+ 1 - 3
farm-crm-biz/src/main/java/jp/yamoto/farm/crm/biz/master/service/impl/MastFarmerServiceImpl.java

@@ -2,7 +2,6 @@ package jp.yamoto.farm.crm.biz.master.service.impl;
 
 
 import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.common.biz.service.ISysConfigService;
 import jp.yamoto.farm.common.core.domain.model.LoginUser;
 import jp.yamoto.farm.common.core.domain.model.LoginUser;
-import jp.yamoto.farm.common.core.enums.DelFlgEnum;
 import jp.yamoto.farm.common.exception.ServiceException;
 import jp.yamoto.farm.common.exception.ServiceException;
 import jp.yamoto.farm.common.utils.*;
 import jp.yamoto.farm.common.utils.*;
 import jp.yamoto.farm.common.utils.uuid.IdUtils;
 import jp.yamoto.farm.common.utils.uuid.IdUtils;
@@ -14,7 +13,6 @@ import jp.yamoto.farm.crm.biz.master.service.IMastFarmerService;
 import lombok.SneakyThrows;
 import lombok.SneakyThrows;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Autowired;
-import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
 import org.springframework.stereotype.Service;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.transaction.annotation.Transactional;
 
 
@@ -185,7 +183,7 @@ public class MastFarmerServiceImpl implements IMastFarmerService {
         }
         }
         // 電話番号
         // 電話番号
         if (ValueUtils.isNotEmpty(mastFarmer.getMailAddress())) {
         if (ValueUtils.isNotEmpty(mastFarmer.getMailAddress())) {
-//            mastFarmer.setPhoneNumber(DecryptUtils.encryptAES(mastFarmer.getPhoneNumber()));
+            mastFarmer.setPhoneNumber(DecryptUtils.encryptAES(mastFarmer.getPhoneNumber()));
         }
         }
 
 
     }
     }