fix

zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/ClassGradeUserServiceImpl.java

@@ -50,6 +50,7 @@ import com.zhongzheng.modules.order.service.IOrderGoodsService;
 import com.zhongzheng.modules.order.service.IOrderService;
 import com.zhongzheng.modules.order.vo.OrderGoodsVo;
 import com.zhongzheng.modules.system.domain.SysOldOrg;
+import com.zhongzheng.modules.system.service.ISysConfigService;
 import com.zhongzheng.modules.system.service.ISysOldOrgService;
 import com.zhongzheng.modules.user.bo.SubjectStudyRecordQueryBo;
 import com.zhongzheng.modules.user.bo.UserBankRecordQueryBo;
@@ -147,6 +148,9 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     @Autowired
     private IUserService iUserService;
 
+    @Autowired
+    private ISysConfigService configService;
+
 
     @Value("${aliyun.oss.endpoint}")
     private String ALIYUN_OSS_ENDPOINT;
@@ -581,6 +585,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isEmpty(userVo.getRealName()) || Validator.isEmpty(userVo.getIdCard()) || Validator.isEmpty(userVo.getTelPhone())) {
             return "用户信息缺失";
         }
+        if(Validator.isNotEmpty(configService.selectConfigByKey("office.account"))){
+            OFFICIALPUSH_INFOACCOUNT = configService.selectConfigByKey("office.account");
+            OFFICIALPUSH_TOKEN = configService.selectConfigByKey("office.token");
+        }
         Map<String, String> params = new HashMap<>();
         params.put("zh", OFFICIALPUSH_INFOACCOUNT);
         params.put("bh", userVo.getOfficialName());
@@ -635,6 +643,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
     public ClassPeriodStudentVo DecryptOfficialInfo(ClassGradeDecryptQueryBo bo) {
         String pars;
         try {
+            if(Validator.isNotEmpty(configService.selectConfigByKeyNoCache("office.account"))){
+                OFFICIALPUSH_INFOACCOUNT = configService.selectConfigByKeyNoCache("office.account");
+                OFFICIALPUSH_TOKEN = configService.selectConfigByKeyNoCache("office.token");
+            }
             ServletUtils.getRequestAttributes().getResponse().setHeader("TenantId", bo.getTenantId());
             //     data = "DjqbGTiWrtqJvLSKObhAB1F+s1vPmc1XWNagrHjwlK1JiCO1CuicJEcP+MzZoUyiSfDLeV2GZio=";
             //     data ="Z4lUlc48qtBmZcg4tbNmt767KDeYhu6h+Xz8ySE5MqYSy3tF1/m2cTLtAQRlHV9X4JtXoCwapll/IiMVNyrOwsZD9Ujjf682";
@@ -787,7 +799,10 @@ public class ClassGradeUserServiceImpl extends ServiceImpl<ClassGradeUserMapper,
         if (Validator.isNotEmpty(userProfile) && userProfile.getStatus() != 1) {
             return "资料审核没通过";
         }*/
-
+        if(Validator.isNotEmpty(configService.selectConfigByKeyNoCache("office.account"))){
+            OFFICIALPUSH_INFOACCOUNT = configService.selectConfigByKeyNoCache("office.account");
+            OFFICIALPUSH_TOKEN = configService.selectConfigByKeyNoCache("office.token");
+        }
         UserStudyRecordQueryBo studyRecordQueryBo = new UserStudyRecordQueryBo();
         studyRecordQueryBo.setUserId(bo.getUserId());
         studyRecordQueryBo.setGradeId(userVo.getGradeId());