he2802 2 жил өмнө
parent
commit
8147c3cc3b

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

@@ -451,4 +451,15 @@ public class CommonController
         map.put("companyName",String.valueOf(objectJson.get("companyName")));
         return AjaxResult.success(map);
     }
+
+    @ApiOperation("获取微信参数")
+    @GetMapping("app/common/wx/config")
+    public AjaxResult<Map<String,Object>> wxConfig() {
+        Map<String,Object> map = new HashMap<>();
+        String smallAppId = configService.selectConfigByKey("wx.small.appid");
+        String gzhAppId = configService.selectConfigByKey("wx.gzh.appid");
+        map.put("smallAppId",smallAppId);
+        map.put("gzhAppId",gzhAppId);
+        return AjaxResult.success(map);
+    }
 }

+ 2 - 0
zhongzheng-admin/src/main/java/com/zhongzheng/controller/distribution/SellerLoginController.java

@@ -68,4 +68,6 @@ public class SellerLoginController extends BaseController {
         map.put(Constants.TOKEN, token);
         return AjaxResult.success(map);
     }
+
+
 }

+ 1 - 10
zhongzheng-api/src/main/java/com/zhongzheng/controller/cmmon/CommonController.java

@@ -193,16 +193,7 @@ public class CommonController extends BaseController {
         return AjaxResult.success(map);
     }
 
-    @ApiOperation("获取微信参数")
-    @GetMapping("/wx/config")
-    public AjaxResult<Map<String,Object>> wxConfig() {
-        Map<String,Object> map = new HashMap<>();
-        String smallAppId = configService.selectConfigByKey("wx.small.appid");
-        String gzhAppId = configService.selectConfigByKey("wx.gzh.appid");
-        map.put("smallAppId",smallAppId);
-        map.put("gzhAppId",gzhAppId);
-        return AjaxResult.success(map);
-    }
+
 
     @ApiOperation("登录双重验证")
     @GetMapping("/dual_auth")

+ 3 - 3
zhongzheng-system/src/main/java/com/zhongzheng/modules/grade/service/impl/UserPeriodServiceImpl.java

@@ -526,7 +526,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
                 .last("limit 1")).stream().findFirst().orElse(null);
         if (org.getShareClass() == 0){
             //有职能的机构学时不推送旧系统
-            return false;
+            return true;
         }
         CourseEducationType educationType = iCourseEducationTypeService.getOne(new LambdaQueryWrapper<CourseEducationType>().eq(CourseEducationType::getStatus, 1).eq(CourseEducationType::getEducationName,"继续教育").last("limit 1"));
         CourseProjectType projectType = iCourseProjectTypeService.getOne(new LambdaQueryWrapper<CourseProjectType>().eq(CourseProjectType::getStatus, 1).eq(CourseProjectType::getEducationId,educationType.getId()).eq(CourseProjectType::getProjectName,"建造师").last("limit 1"));
@@ -541,7 +541,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             CourseBusiness business7 = iCourseBusinessService.getOne(new LambdaQueryWrapper<CourseBusiness>().eq(CourseBusiness::getStatus, 1).eq(CourseBusiness::getId,goodsVo.getBusinessId()).last("limit 1"));
             if(Validator.isEmpty(business7)||(Validator.isNotEmpty(business7)&&!"七大员".equals(business7.getBusinessName()))){
                 if(!"继续教育二级造价师".equals(fullName)){
-                    return false;
+                    return true;
                 }
             }
             if(Validator.isNotEmpty(business7)&&"七大员".equals(business7.getBusinessName())){
@@ -844,7 +844,7 @@ public class UserPeriodServiceImpl extends ServiceImpl<UserPeriodMapper, UserPer
             throw new CustomException("同步请求错误"+e.getMessage());
         }
         iClassGradeUserService.update(null, objectLambdaUpdateWrapper);
-        return false;
+        return true;
     }
 
     /**