Просмотр исходного кода

修改分享收集手机号二维码素材筛选逻辑

cgp 7 часов назад
Родитель
Сommit
563a60380c

+ 6 - 5
fs-company/src/main/java/com/fs/company/controller/qw/FsCompanyCustomerController.java

@@ -17,6 +17,7 @@ import com.fs.framework.security.SecurityUtils;
 import com.fs.his.domain.FsDoctorPatient;
 import com.fs.his.domain.FsPrescribe;
 import com.fs.his.domain.FsPrescribeDataScrm;
+import com.fs.his.domain.FsShareMaterial;
 import com.fs.his.dto.AddressInfoDTO;
 import com.fs.his.param.CollectionPhoneParam;
 import com.fs.his.param.PrescribePhoneParam;
@@ -520,11 +521,11 @@ public class FsCompanyCustomerController extends BaseController {
      * */
     @GetMapping("/getShareMaterialList")
     public AjaxResult getShareMaterialList() {
-        QrcRedPackageConfigVO config = sysConfigService.getConfig(QRC_RED_PACKAGE_CONFIG_KEY, QrcRedPackageConfigVO.class);
-        if (config==null){
-            return AjaxResult.error("未找到分享收集手机号的二维码配置");
-        }
-        return AjaxResult.success(fsShareMaterialService.getShareMaterialListByType(config.getType()));
+//        QrcRedPackageConfigVO config = sysConfigService.getConfig(QRC_RED_PACKAGE_CONFIG_KEY, QrcRedPackageConfigVO.class);
+//        if (config==null){
+//            return AjaxResult.error("未找到分享收集手机号的二维码配置");
+//        }
+        return AjaxResult.success(fsShareMaterialService.selectFsShareMaterialList(new FsShareMaterial()));
     }
 
     /**