ludc
2023-07-12 55400f5a76ea389970b2efebe7d0ea8b86a9f746
Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/controller/MdmEngineController.java
@@ -3,6 +3,7 @@
import com.alibaba.fastjson.JSONObject;
import com.alibaba.nacos.common.utils.StringUtils;
import com.baomidou.mybatisplus.core.metadata.IPage;
import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
import com.vci.ubcs.code.dto.CodeDeleteBatchDTO;
import com.vci.ubcs.code.dto.CodeOrderDTO;
@@ -509,12 +510,12 @@
    * @return 分类码值的内容
    */
   @GetMapping("/listCodeClassifyValueBySecOid")
   public DataGrid<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
   public IPage<CodeClassifyValueVO> listCodeClassifyValueBySecOid(String classifySecOid, String parentClassifyValueOid){
      List<CodeClassifyValueVO> valueVOS = engineService.listCodeClassifyValueBySecOid(classifySecOid, parentClassifyValueOid);
      DataGrid<CodeClassifyValueVO> dataGrid = new DataGrid<>();
      dataGrid.setData(valueVOS);
      dataGrid.setTotal(valueVOS==null?0:valueVOS.size());
      return dataGrid;
      IPage<CodeClassifyValueVO> valueVOIPage = new Page<>();
      valueVOIPage.setRecords(valueVOS);
      valueVOIPage.setTotal(valueVOS==null?0:valueVOS.size());
      return valueVOIPage;
   }
   /**
@@ -523,7 +524,7 @@
    * @return 编码规则的内容
    */
   @GetMapping("/getCodeRuleByClassifyOid")
//   @VciUnCheckRight
   //   @VciUnCheckRight
   public R<CodeRuleVO> getCodeRuleByClassifyOid(String codeClassifyOid){
      return R.data(engineService.getCodeRuleByClassifyOid(codeClassifyOid));
   }
@@ -695,7 +696,7 @@
    * @return 执行的结果
    */
   @GetMapping("/defaultReferDataGrid")
   public Page<BtmTypeVO>  defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
   public IPage<BaseModel> defaultReferDataGrid(UIFormReferVO referConfigVO, BaseQueryObject baseQueryObject){
      return engineService.referDataGrid(referConfigVO,baseQueryObject);
   }