Merge remote-tracking branch 'origin/master'

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/advise/service/impl/BasicsPlaintServiceImpl.java

@@ -46,9 +46,6 @@ public class BasicsPlaintServiceImpl extends ServiceImpl<BasicsPlaintMapper, Bas
    @Lazy
    private CustCasualApi custCasualApi;
 
-   @Autowired
-   private AesEncryptUtil aesEncryptUtil;
-//   @ApiModelProperty
    @Autowired
    private AllocCanteenApi allocCanteenApi;
 
@@ -59,7 +56,7 @@ public class BasicsPlaintServiceImpl extends ServiceImpl<BasicsPlaintMapper, Bas
       } else {
          BasicsComplaint basicsComplaint = new BasicsComplaint();
          basicsComplaint.setCustId(custId);
-         complaint.setMobile(AesEncryptUtil.aesDecode(complaint.getMobile()));
+         complaint.setMobile(complaint.getMobile());
          LeBeanUtil.copyProperties(complaint, basicsComplaint);
          basicsComplaint.setComplaintId(Id.next());
          if (CollectionUtil.isNotEmpty(complaint.getComplaintPictureList())) {
@@ -79,7 +76,7 @@ public class BasicsPlaintServiceImpl extends ServiceImpl<BasicsPlaintMapper, Bas
          List<AppletPlaintVO> appletPlaintVOList = new ArrayList();
          appletPlaintParams.forEach((appletPlaintParam) -> {
             AppletPlaintVO appletPlaint = new AppletPlaintVO();
-            appletPlaintParam.setMobile(AesEncryptUtil.aesEncrypt(appletPlaintParam.getMobile()));
+            appletPlaintParam.setMobile(appletPlaintParam.getMobile());
             LeBeanUtil.copyProperties(appletPlaintParam, appletPlaint);
             appletPlaint.setComplaintPictureList(new ArrayList());
             if (StrUtil.isNotBlank(appletPlaintParam.getComplaintPicture())) {
@@ -111,7 +108,7 @@ public class BasicsPlaintServiceImpl extends ServiceImpl<BasicsPlaintMapper, Bas
       plaintPage.getRecords().forEach((record) -> {
          String sourceName = SourceTypeEnum.getDesc(record.getSourceType());
          record.setSourceName(sourceName);
-         record.setMobile(this.aesEncryptUtil.aesEncrypt(record.getMobile()));
+         record.setMobile(record.getMobile());
          if (StrUtil.isNotBlank(record.getComplaintPicture())) {
             record.setComplaintPictureList(Arrays.asList(record.getComplaintPicture().split(",")));
          }

bonus-modules/bonus-smart-canteen/src/main/java/com/bonus/canteen/core/allocation/advise/vo/BasicsComplaintPageVO.java

@@ -29,6 +29,7 @@ public class BasicsComplaintPageVO {
    @LeNiuDecryptField
    private String custName;
    @ApiModelProperty("联系方式")
+   @LeNiuDecryptField
    private String mobile;
    @ApiModelProperty("人员编号")
    private String custNum;