Merge remote-tracking branch 'origin/master'

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/controller/admin/hwk/HwkController.java

@@ -68,7 +68,6 @@ public class HwkController {
    // @PreAuthorize("@ss.hasPermission('coding:hwk:queryByCfId')")
     public CommonResult<HwkRespVO> getHwkByCfId(@RequestParam("cfId") Long cfId) {
         HwkDO hwk = hwkService.getHwkByCfId(cfId);
-        HwkRespVO hwkRespVO = BeanUtils.toBean(hwk, HwkRespVO.class);
         return success(BeanUtils.toBean(hwk, HwkRespVO.class));
     }
     @GetMapping("/get")

delivery-module-core/delivery-module-core-biz/src/main/java/com/unis/module/coding/service/hwk/HwkServiceImpl.java

@@ -151,8 +151,11 @@ public class HwkServiceImpl implements HwkService {
 
     @Override
     public HwkDO getHwkByCfId(Long cfId) {
-        HwkDO hwkByCfId = hwkMapper.getHwkByCfId(cfId);
-        return hwkByCfId;
+        List<HwkDO> cf_id = hwkMapper.selectList(new QueryWrapper<HwkDO>().eq("CF_ID", cfId));
+        if (CollectionUtil.isNotEmpty(cf_id)) {
+            return cf_id.get(0);
+        }
+        return null;
     }
 
 }