submit

zhongzheng-admin/src/main/java/com/zhongzheng/controller/common/CommonController.java

@@ -901,4 +901,5 @@ public class CommonController extends BaseController {
         iFaceService.DetectFace(bo);
         return AjaxResult.success();
     }
+
 }

zhongzheng-admin/src/main/java/com/zhongzheng/controller/schedule/ScheduleController.java

@@ -416,10 +416,10 @@ public class ScheduleController extends BaseController {
         //茂名市建设培训学校 680980002459417532
         //肇庆市建筑业协会 480813706424615769
 //        List<String> tenantIds = Arrays.asList("972001468256950403", "680980002459417532", "480813706424615769");
-        List<String> tenantIds = Arrays.asList("87440920140968","694515817698614");
-        tenantIds.forEach(tenantId -> {
-            iScheduleService.synchronizationGoodsByTenantId(tenantId);
-        });
+//        List<String> tenantIds = Arrays.asList("87440920140968","694515817698614");
+//        tenantIds.forEach(tenantId -> {
+//            iScheduleService.synchronizationGoodsByTenantId(tenantId);
+//        });
         return AjaxResult.success();
     }
 

zhongzheng-common/src/main/java/com/zhongzheng/common/type/EncryptHandler.java

@@ -39,6 +39,27 @@ public class EncryptHandler  implements TypeHandler<String> {
         if (value.length()<=20 ) {
             return value;
         }
+        String s = SecureUtil.aes(KEYS).decryptStr(value);
+        String authorizationToken = ServletUtils.getRequest().getHeader("AuthorizationToken");
+        if (com.baomidou.mybatisplus.core.toolkit.StringUtils.isNotBlank(authorizationToken)){
+            Boolean phoneConceal = false;
+            try (InputStream inputStream = EncryptHandler.class.getClassLoader().getResourceAsStream("application.yml")) {
+                Properties properties = new Properties();
+                properties.load(inputStream);
+                String property = properties.getProperty("conceal");
+                phoneConceal = Boolean.valueOf(property);
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+            if (phoneConceal){
+                //开启手机号码加密
+                LoginUser loginUser = SecurityUtils.getLoginUser();
+                if (s.length() <= 11 &&
+                        (ObjectUtils.isNull(loginUser.getPhoneConcealSign()) || loginUser.getPhoneConcealSign() != 1)){
+                    return TelPhoneUtils.hideTelPhone(s);
+                }
+            }
+        }
         return SecureUtil.aes(KEYS).decryptStr(value);
     }
 

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/mapper/GoodsMapper.java

@@ -14,6 +14,7 @@ import com.zhongzheng.modules.goods.bo.GoodsQueryBo;
 import com.zhongzheng.modules.goods.bo.UserGoodsListAllBo;
 import com.zhongzheng.modules.goods.domain.Goods;
 import com.zhongzheng.modules.goods.vo.*;
+import com.zhongzheng.modules.system.domain.SysGoodsCopyRecord;
 import com.zhongzheng.modules.system.domain.SysTenant;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.security.core.parameters.P;

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/IGoodsService.java

@@ -164,7 +164,4 @@ public interface IGoodsService extends IService<Goods> {
 
 	List<Goods> getRelGoodsNoTenant(String businessName, String categoryName, Long tenantId);
 
-
-
-
 }

zhongzheng-system/src/main/java/com/zhongzheng/modules/goods/service/impl/GoodsServiceImpl.java

@@ -5289,7 +5289,6 @@ public class GoodsServiceImpl extends ServiceImpl<GoodsMapper, Goods> implements
     }
 
 
-
     private void updateHandoutsId(Long goodsId, Long tenantId, Long handoutsId) {
         baseMapper.updateHandoutsId(goodsId, tenantId, handoutsId);
     }