提交代码

 Source/UBCS-WEB/src/util/param2CondMapUtil.js

ÎļþÒÑɾ³ý

 Source/UBCS-WEB/src/views/authority/role.vue

@@ -84,6 +84,7 @@
  import {add, getPage, getRole, getRoleTreeById, grant, grantTree, remove, update} from "@/api/system/role";
  import {mapGetters} from "vuex";
  import website from '@/config/website';
  import {setStore, getStore} from '@/util/store'

  export default {
    data() {
@@ -142,8 +143,8 @@
              prop: "tenantId",
              type: "tree",
              dicUrl: "/api/ubcs-system/tenant/select",
              addDisplay: false,
              editDisplay: false,
              addDisplay: website.tenantId === getStore({name: 'tenantId'}),
              editDisplay: website.tenantId === getStore({name: 'tenantId'}),
              viewDisplay: website.tenantMode,
              span: 24,
              props: {
@@ -154,7 +155,7 @@
              search: website.tenantMode,
              rules: [{
                required: true,
                message: "请输入所属租户",
                message: "请选择所属租户",
                trigger: "click"
              }]
            },

 Source/UBCS/ubcs-ops - ¿ì½Ý·½Ê½.lnk

Binary files differ

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/CodeClstemplateServiceImpl.java

@@ -45,6 +45,7 @@
import org.springblade.core.mp.support.Query;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.api.R;
import org.springblade.core.tool.utils.Func;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.cglib.beans.BeanMap;
import org.springframework.context.annotation.Lazy;
@@ -1096,7 +1097,7 @@
            //递归找上级的模板
            CodeClassify classifyDO = codeClassifyMapper.selectById(codeClassifyOid);
//                codeClassifyDaoI.selectByPrimaryKey(codeClassifyOid);
            if(classifyDO==null&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
            if(Func.isEmpty(classifyDO)&&StringUtils.isBlank(classifyDO.getParentCodeClassifyOid())){
                //说明已经是顶了，也没找到的话，那就返回了
                return null;
            }

 Source/UBCS/ubcs-service/ubcs-code/src/main/java/com/vci/ubcs/code/service/impl/MdmEngineServiceImpl.java

@@ -1409,7 +1409,16 @@
    public DataGrid<Map<String, String>> queryGrid(String btmType, CodeClassifyTemplateVO templateVO, Map<String, String> conditionMap, PageHelper pageHelper) {
        CodeTemplateAttrSqlBO sqlBO = getSqlByTemplateVO(btmType, templateVO, conditionMap, pageHelper);
//        List<Map> maps = boService.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
        List<Map<String, String>> maps = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
        List<Map<String, String>> maps = null;
        try {
            maps = commonsMapper.queryByOnlySqlForMap(sqlBO.getSqlHasPage());
        }catch (Exception e){
            String errorMessage = e.getMessage();
            if (errorMessage.contains("无法解析的成员访问表达式")) {
                throw new ServiceException("缺少"+errorMessage.substring(errorMessage.indexOf("[t.") + 1, errorMessage.indexOf("]"))+"字段");
            }
            throw new ServiceException(e.getMessage());
        }

        DataGrid<Map<String, String>> dataGrid = new DataGrid<>();
        List<Map<String, String>> dataList = new ArrayList<>();