diff --git a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java index b393e09..80caf66 100644 --- a/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java +++ b/src/main/java/com/hxgk/lowcode/mapper/CustomerFormViewMapper.java @@ -2,6 +2,7 @@ package com.hxgk.lowcode.mapper; import com.hxgk.lowcode.model.entity.CustomerFormView; import org.apache.ibatis.annotations.Mapper; +import org.apache.ibatis.annotations.Param; import java.util.ArrayList; @@ -16,4 +17,6 @@ public interface CustomerFormViewMapper { CustomerFormView getTableNameByCfid(String formId); String getIdByCfid(String cfid); + + ArrayList getAppsByGroupId(@Param("groupid") String id); } diff --git a/src/main/java/com/hxgk/lowcode/model/entity/Appmenus.java b/src/main/java/com/hxgk/lowcode/model/entity/Appmenus.java index 38dc078..c8b36a0 100644 --- a/src/main/java/com/hxgk/lowcode/model/entity/Appmenus.java +++ b/src/main/java/com/hxgk/lowcode/model/entity/Appmenus.java @@ -22,7 +22,24 @@ public class Appmenus { private Integer sort; private Integer state; private Integer isMain; + private String customerFormId; + private String tableStructure; + public String getTableStructure() { + return tableStructure; + } + + public void setTableStructure(String tableStructure) { + this.tableStructure = tableStructure; + } + + public String getCustomerFormId() { + return customerFormId; + } + + public void setCustomerFormId(String customerFormId) { + this.customerFormId = customerFormId; + } public String getId() { return id; diff --git a/src/main/java/com/hxgk/lowcode/model/entity/CustomerFormView.java b/src/main/java/com/hxgk/lowcode/model/entity/CustomerFormView.java index d800b1c..b237228 100644 --- a/src/main/java/com/hxgk/lowcode/model/entity/CustomerFormView.java +++ b/src/main/java/com/hxgk/lowcode/model/entity/CustomerFormView.java @@ -18,13 +18,122 @@ public class CustomerFormView { private String dict; private String cfid; private String name; - private String permit; private Integer classify; + private String permit; private String permitstr; private String flowkey; private String postpermit; + private String userpermit; private String powerstr; + private String groupid; + private String icon; + private Integer flowIsOpen; + private String listjson; + private Integer visibility; + private String authorizationRoles; + private String authorizedPersonnel; + private String authorizedOrg; + private String authorizedPosition; private String signCode; + private String describe; + private Integer states; + + + public String getUserpermit() { + return userpermit; + } + + public void setUserpermit(String userpermit) { + this.userpermit = userpermit; + } + + public String getGroupid() { + return groupid; + } + + public void setGroupid(String groupid) { + this.groupid = groupid; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } + + public Integer getFlowIsOpen() { + return flowIsOpen; + } + + public void setFlowIsOpen(Integer flowIsOpen) { + this.flowIsOpen = flowIsOpen; + } + + public String getListjson() { + return listjson; + } + + public void setListjson(String listjson) { + this.listjson = listjson; + } + + public Integer getVisibility() { + return visibility; + } + + public void setVisibility(Integer visibility) { + this.visibility = visibility; + } + + public String getAuthorizationRoles() { + return authorizationRoles; + } + + public void setAuthorizationRoles(String authorizationRoles) { + this.authorizationRoles = authorizationRoles; + } + + public String getAuthorizedPersonnel() { + return authorizedPersonnel; + } + + public void setAuthorizedPersonnel(String authorizedPersonnel) { + this.authorizedPersonnel = authorizedPersonnel; + } + + public String getAuthorizedOrg() { + return authorizedOrg; + } + + public void setAuthorizedOrg(String authorizedOrg) { + this.authorizedOrg = authorizedOrg; + } + + public String getAuthorizedPosition() { + return authorizedPosition; + } + + public void setAuthorizedPosition(String authorizedPosition) { + this.authorizedPosition = authorizedPosition; + } + + public String getDescribe() { + return describe; + } + + public void setDescribe(String describe) { + this.describe = describe; + } + + public Integer getStates() { + return states; + } + + public void setStates(Integer states) { + this.states = states; + } public String getSignCode() { return signCode; diff --git a/src/main/java/com/hxgk/lowcode/service/AppmenusService.java b/src/main/java/com/hxgk/lowcode/service/AppmenusService.java index d979c88..2d98278 100644 --- a/src/main/java/com/hxgk/lowcode/service/AppmenusService.java +++ b/src/main/java/com/hxgk/lowcode/service/AppmenusService.java @@ -1,8 +1,9 @@ package com.hxgk.lowcode.service; import com.hxgk.lowcode.model.entity.CustomerForm; +import com.hxgk.lowcode.model.entity.CustomerFormView; import com.hxgk.lowcode.model.entity.Tree; public interface AppmenusService { - Tree getAppTree(String appmenusAppkey, CustomerForm customerForm); + Tree getAppTree(String appmenusAppkey, CustomerFormView customerForm); } diff --git a/src/main/java/com/hxgk/lowcode/service/CustomerFormViewService.java b/src/main/java/com/hxgk/lowcode/service/CustomerFormViewService.java new file mode 100644 index 0000000..69c5305 --- /dev/null +++ b/src/main/java/com/hxgk/lowcode/service/CustomerFormViewService.java @@ -0,0 +1,10 @@ +package com.hxgk.lowcode.service; + +import com.hxgk.lowcode.model.entity.CustomerFormGroup; +import com.hxgk.lowcode.model.entity.CustomerFormView; + +import java.util.ArrayList; + +public interface CustomerFormViewService { + ArrayList getAppsByGroupId(CustomerFormGroup item); +} diff --git a/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java index aae489e..0209621 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/AppmenusSerciceImpl.java @@ -4,8 +4,10 @@ import com.baomidou.dynamic.datasource.annotation.DS; import com.hxgk.lowcode.mapper.AppmenusMapper; import com.hxgk.lowcode.model.entity.Appmenus; import com.hxgk.lowcode.model.entity.CustomerForm; +import com.hxgk.lowcode.model.entity.CustomerFormView; import com.hxgk.lowcode.model.entity.Tree; import com.hxgk.lowcode.service.AppmenusService; +import org.apache.commons.lang3.StringUtils; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; @@ -21,7 +23,7 @@ public class AppmenusSerciceImpl implements AppmenusService { @Autowired AppmenusMapper appmenusMapper; @Override - public Tree getAppTree(String appmenusAppkey, CustomerForm customerForm) { + public Tree getAppTree(String appmenusAppkey, CustomerFormView customerForm) { ArrayList appmenusList = appmenusMapper.getMenuList(appmenusAppkey); //if(appmenusAppkey.equals("307150721797591040")){ //先把所有都转成tree对象 @@ -45,14 +47,16 @@ public class AppmenusSerciceImpl implements AppmenusService { * */ - public static Tree convertCustomerFormToTreeObj(CustomerForm customerForm){ + public static Tree convertCustomerFormToTreeObj(CustomerFormView customerForm){ Tree tree = new Tree(); tree.setId(customerForm.getSignCode()); tree.setLabel(customerForm.getName()); - tree.setParentId(customerForm.getGroupId()); + tree.setParentId(customerForm.getGroupid()); HashMap attrs = new HashMap<>(); - attrs.put("tablename", customerForm.getTablename()); + attrs.put("tablekey", customerForm.getTablekey()); attrs.put("classify", customerForm.getClassify()); + attrs.put("signCode", customerForm.getSignCode()); + /* attrs.put("permit", customerForm.getPermit()); attrs.put("states", customerForm.getStates()); attrs.put("createrTime", customerForm.getCreaterTime()); @@ -64,12 +68,12 @@ public class AppmenusSerciceImpl implements AppmenusService { attrs.put("icon", customerForm.getIcon()); attrs.put("flowIsOpen", customerForm.getFlowIsOpen()); attrs.put("listjson", customerForm.getListjson()); - attrs.put("signCode", customerForm.getSignCode()); + attrs.put("describe", customerForm.getDescribe()); attrs.put("orgpermit", customerForm.getOrgpermit()); attrs.put("appManager", customerForm.getAppManager()); attrs.put("appRoleManager", customerForm.getAppRoleManager()); - attrs.put("app0rgman", customerForm.getAppOrgMan()); + attrs.put("app0rgman", customerForm.getAppOrgMan());*/ tree.setTreeAttrs(attrs); return tree; } @@ -84,17 +88,19 @@ public class AppmenusSerciceImpl implements AppmenusService { HashMap attrs = new HashMap<>(); attrs.put("type", appmenus.getType()); - attrs.put("svg", appmenus.getSvg()); + /*attrs.put("svg", appmenus.getSvg()); attrs.put("pclSShow", appmenus.getPclsShow()); - attrs.put("waplsShow", appmenus.getWaplsShow()); - attrs.put("appkey", appmenus.getAppkey()); - attrs.put("createrTime", appmenus.getCreaterTime()); + attrs.put("waplsShow", appmenus.getWaplsShow());*/ + //attrs.put("appkey", appmenus.getAppkey()); + /*attrs.put("createrTime", appmenus.getCreaterTime()); attrs.put("editTime", appmenus.getEditTime()); - attrs.put("creater", appmenus.getCreater()); + attrs.put("creater", appmenus.getCreater());*/ attrs.put("isLock", appmenus.getIsLock()); - attrs.put("sort", appmenus.getSort()); + /*attrs.put("sort", appmenus.getSort()); attrs.put("state", appmenus.getState()); - attrs.put("isMain", appmenus.getIsMain()); + attrs.put("isMain", appmenus.getIsMain());*/ + attrs.put("customerFormId", appmenus.getCustomerFormId()); + attrs.put("tableStructure",appmenus.getTableStructure()); tree.setTreeAttrs(attrs); list.add(tree); } @@ -114,6 +120,7 @@ public class AppmenusSerciceImpl implements AppmenusService { } } + return result; } @@ -121,6 +128,36 @@ public class AppmenusSerciceImpl implements AppmenusService { //这个方法是在找rootTree的所有子节点,然后返回rootTree for (Tree tree : list) { if(rootTree.getId().equals(tree.getParentId())){ + + if(tree.getTreeAttrs().get("tableStructure")!=null && !tree.getTreeAttrs().get("tableStructure").toString().equals("")){ + /*System.out.println("子表子表子表子表子表子表子表子表子表子表子表子表-----------------"+tree.getLabel()); + System.out.println(tree.getTreeAttrs().get("tableStructure").toString());*/ + String tableStructure = tree.getTreeAttrs().get("tableStructure").toString(); + tableStructure = tableStructure.replace("{",""); + tableStructure = tableStructure.replace("}",""); + tableStructure = tableStructure.replace("\"",""); + String[] tableStructureArr = StringUtils.splitByWholeSeparator(tableStructure, ","); + ArrayList treeArrayList = new ArrayList<>(); + for(String item1:tableStructureArr){ + String l = StringUtils.splitByWholeSeparator(item1, ":")[1]; + Tree tree3 = new Tree(); + tree3.setLabel("子表-"+l); + tree3.setParentId(tree.getId()); + tree3.setId(tree.getId()+":zibiaoid-"+l); + tree3.setValue(tree3.getId()); + treeArrayList.add(tree3); + } + tree.setChildren(treeArrayList); + } + + if(((Integer) tree.getTreeAttrs().get("isLock")==2)&&((Integer)tree.getTreeAttrs().get("type")==2)){ + tree.setDisabled(false); + tree.setId((String)tree.getTreeAttrs().get("customerFormId")); + tree.setLabel("Form-"+tree.getLabel()); + }else{ + tree.setLabel("目录-"+tree.getLabel()); + tree.setDisabled(true); + } if(rootTree.getChildren() == null){ rootTree.setChildren(new ArrayList<>()); } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java index 1de2192..3fd9260 100644 --- a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormServiceImpl.java @@ -48,11 +48,15 @@ public class CustomerFormServiceImpl implements CustomerFormService { @Autowired private AppmenusService appmenusService; + @Autowired + private CustomerFormViewService customerFormViewService; + private static final Logger logger = LogManager.getLogger(); - /*@Override + //根据用户权限查询表单列表 - public Tree getCustomerFormList(String key, String token) { + //@Override + public Tree getCustomerFormListOld(String key, String token) { //查询出所有表单 @@ -173,7 +177,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { Tree tree1 = new Tree(); if(item.getClassify()==3){//app - *//*String signCode = item.getSignCode(); + String signCode = item.getSignCode(); //调用GO接口获取App结构,过滤掉非表单和目录的数据 String url = "http://172.20.2.87:7777/app/gainAppEditPsge";//本地+内网 @@ -188,7 +192,7 @@ public class CustomerFormServiceImpl implements CustomerFormService { System.out.println("post:"+post.toString()); } catch (IOException e) { e.printStackTrace(); - }*//* + } tree1.setId(item.getCfid()); tree1.setParentId(tree.getId()); @@ -286,34 +290,33 @@ public class CustomerFormServiceImpl implements CustomerFormService { } - }*/ + } + - @Override - //根据用户权限查询表单列表 - public Tree getCustomerFormList(String key, String token) { - //查询出所有分组 - ArrayList allCustomerFormGroup = customerFormGroupService.getAllCustomerFormGroup(); - ArrayList> appslists = new ArrayList<>(); - ArrayList> AllGroupAppTreeList = new ArrayList<>(); - for (CustomerFormGroup item: allCustomerFormGroup) { - //获取分组中的所有App - ArrayList appsByGroupId = getAppsByGroupId(item); - appslists.add(appsByGroupId); - //获取App的目录树 - ArrayList singleGroupAppTreeList = new ArrayList<>(); - for(CustomerForm item1:appsByGroupId){ - String appmenusAppkey = item1.getSignCode(); - Tree appTree = appmenusService.getAppTree(appmenusAppkey,item1); - singleGroupAppTreeList.add(appTree); - } - AllGroupAppTreeList.add(singleGroupAppTreeList); - } - System.out.println(1); + + /* + * 流泉之众 玛拉尼 团结 在鲜血流尽之前，请用燧石划过刀锋，留下一盏小小的灯。这样火焰便与整个纳塔的目光连接在了一起。即便永世的漆黑也无法将你我分离。 + * + * 回声之子 希诺宁 祝福 镶泥的燧石，回响的嵴峰。拱聚，弥散，余烬后再生灭。为诞出的新焰，掀示黎明的一方。 + * + * 沃陆之邦 伊安珊 力量 勇者登上火山摘取太阳。烈焰为她加冕，光芒耀眼如璀璨星河。引我走出最初一步。 + * + * 烟谜主 欧洛伦 奉献 全视者正为预见到自我的死亡而欢宴。让我们举起肉骨与酒杯，为全力以赴的英雄唱最后一曲。庆贺他的如愿以偿。 + * + * 悬木人 基尼奇 回火 柴火的往日，烈焰的今时，皆为永不回头的生命。所行一切，火必将审问。 + * + * 花羽会 恰斯卡 超越 我将一生的苦难留作墓志铭。纪念我曾拥有过它们，也纪念我『超越』了它们。 + * */ + + @Override + //根据用户权限查询表单列表 + public Tree getCustomerFormList(String key, String token) { + //查询出所有表单 ArrayList customerFormList = customerFormMapper.getCustomerFormList(); @@ -422,125 +425,79 @@ public class CustomerFormServiceImpl implements CustomerFormService { } } //根据权限过滤完成customerFormList1 - ArrayList tablekeyList = new ArrayList<>(); - for(CustomerForm item:customerFormList1){ - tablekeyList.add(item.getTablename()); - } - ArrayList customerFormViewArrayList = customerFormViewMapper.getCustomerFormViewListByTablekey(tablekeyList); - ArrayList treeArrayList1 = new ArrayList<>(); - for(CustomerFormView item:customerFormViewArrayList){ - - Tree tree1 = new Tree(); - if(item.getClassify()==3){//app - /*String signCode = item.getSignCode(); - //调用GO接口获取App结构,过滤掉非表单和目录的数据 - - String url = "http://172.20.2.87:7777/app/gainAppEditPsge";//本地+内网 - //String url = "http://36.133.126.182:39250/app/gainAppEditPsge";//外网 - - JSONObject param = new JSONObject(); - param.put("id", signCode); - String post = null; - - try { - post = HttpUtils.send(url, param, HTTP.UTF_8, key, token); - System.out.println("post:"+post.toString()); - } catch (IOException e) { - e.printStackTrace(); - }*/ - - tree1.setId(item.getCfid()); - tree1.setParentId(tree.getId()); - tree1.setLabel("App-"+item.getName()); - tree1.setValue(item.getCfid()); - tree1.setDisabled(true); - - ArrayList appForms = customerFormViewMapper.getCustomerFormViewListByGroupid(item.getSignCode()); - if(appForms.size()>0){ - ArrayList treeArrayListx = new ArrayList<>(); - for(CustomerFormView itemx:appForms){ - Tree tree2 = new Tree(); - - tree2.setId(itemx.getCfid()); - tree2.setParentId(tree1.getId()); - tree2.setLabel("Form-"+itemx.getName()); - tree2.setValue(itemx.getCfid()); - HashMap treeAttrs = new HashMap<>(); - treeAttrs.put("version",itemx.getVersion().toString()); - tree2.setTreeAttrs(treeAttrs); - ArrayList treeArrayList = new ArrayList<>(); - if(!StringUtils.isBlank(itemx.getTableStructure())){ - String tableStructure = itemx.getTableStructure(); - tableStructure = tableStructure.replace("{",""); - tableStructure = tableStructure.replace("}",""); - tableStructure = tableStructure.replace("\"",""); - String[] tableStructureArr = StringUtils.splitByWholeSeparator(tableStructure, ","); - for(String item1:tableStructureArr){ - String l = StringUtils.splitByWholeSeparator(item1, ":")[1]; - Tree tree3 = new Tree(); - tree3.setLabel("子表-"+l); - tree3.setParentId(tree2.getId()); - tree3.setId(tree2.getId()+":zibiaoid-"+l); - tree3.setValue(tree3.getId()); - treeArrayList.add(tree3); - } + //查询出所有分组 + ArrayList allCustomerFormGroup = customerFormGroupService.getAllCustomerFormGroup(); + ArrayList> appslists = new ArrayList<>(); + ArrayList> allGroupAppTreeList = new ArrayList<>(); + //分组树list + ArrayList groupTree = new ArrayList<>(); + + for (CustomerFormGroup item: allCustomerFormGroup) { + //单个分组的树 + Tree singleGroupTree = new Tree(); + singleGroupTree.setId(item.getId()); + singleGroupTree.setParentId(tree.getId()); + singleGroupTree.setLabel("分组-"+item.getTitle()); + singleGroupTree.setValue(item.getId()); + singleGroupTree.setDisabled(true); + HashMap singleGroupTreeAttrs = new HashMap<>(); + singleGroupTreeAttrs.put("superior",item.getSuperior()); + singleGroupTreeAttrs.put("sort",item.getSort()); + singleGroupTreeAttrs.put("icon",item.getIcon()); + singleGroupTreeAttrs.put("ordid",item.getOrdid()); + singleGroupTreeAttrs.put("state",item.getState()); + singleGroupTreeAttrs.put("time",item.getTime()); + singleGroupTree.setTreeAttrs(singleGroupTreeAttrs); + + + + //获取分组中的所有App + //ArrayList appsByGroupId = getAppsByGroupId(item); + ArrayList appsByGroupId_view = customerFormViewService.getAppsByGroupId(item); + appslists.add(appsByGroupId_view); + //获取App的目录树 + ArrayList singleGroupAppTreeList = new ArrayList<>(); + for(CustomerFormView item1:appsByGroupId_view){ + String appmenusAppkey = item1.getSignCode(); + //筛选权限 + int count = 0; + for(CustomerForm item2:customerFormList1){ + if(item2.getSignCode().equals(appmenusAppkey)){ + count++; + } + } + if(count>0){ + Tree appTree = appmenusService.getAppTree(appmenusAppkey,item1); + appTree.setDisabled(true); + appTree.setLabel("App-"+appTree.getLabel()); + if(appTree.getChildren()!=null && appTree.getChildren().size()>0){ + singleGroupAppTreeList.add(appTree); + } - } - tree2.setChildren(treeArrayList); - treeArrayListx.add(tree2); + } - } + } + allGroupAppTreeList.add(singleGroupAppTreeList); + if(singleGroupAppTreeList!=null && singleGroupAppTreeList.size()>0){ + singleGroupTree.setChildren(singleGroupAppTreeList); + groupTree.add(singleGroupTree); + } - HashMap treeAttrs = new HashMap<>(); - treeAttrs.put("version",item.getVersion().toString()); - tree1.setChildren(treeArrayListx); - tree1.setTreeAttrs(treeAttrs); - } - treeArrayList1.add(tree1); - }else{ - tree1.setId(item.getCfid()); - tree1.setParentId(tree.getId()); - tree1.setLabel("Form-"+item.getName()); - tree1.setValue(item.getCfid()); - HashMap treeAttrs = new HashMap<>(); - treeAttrs.put("version",item.getVersion().toString()); - tree1.setTreeAttrs(treeAttrs); - ArrayList treeArrayList = new ArrayList<>(); - if(!StringUtils.isBlank(item.getTableStructure())){ - - String tableStructure = item.getTableStructure(); - tableStructure = tableStructure.replace("{",""); - tableStructure = tableStructure.replace("}",""); - tableStructure = tableStructure.replace("\"",""); - String[] tableStructureArr = StringUtils.splitByWholeSeparator(tableStructure, ","); - for(String item1:tableStructureArr){ - String l = StringUtils.splitByWholeSeparator(item1, ":")[1]; - Tree tree2 = new Tree(); - tree2.setLabel("子表-"+l); - tree2.setParentId(tree1.getId()); - tree2.setId(tree1.getId()+":zibiaoid-"+l); - tree2.setValue(tree2.getId()); - treeArrayList.add(tree2); - } + } - } - tree1.setChildren(treeArrayList); - treeArrayList1.add(tree1); - } + tree.setChildren(groupTree); - } - tree.setChildren(treeArrayList1); return tree; } diff --git a/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormViewServiceImpl.java b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormViewServiceImpl.java new file mode 100644 index 0000000..1a081e8 --- /dev/null +++ b/src/main/java/com/hxgk/lowcode/service/impl/CustomerFormViewServiceImpl.java @@ -0,0 +1,23 @@ +package com.hxgk.lowcode.service.impl; + +import com.hxgk.lowcode.mapper.CustomerFormViewMapper; +import com.hxgk.lowcode.model.entity.CustomerFormGroup; +import com.hxgk.lowcode.model.entity.CustomerFormView; +import com.hxgk.lowcode.service.CustomerFormViewService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + +import java.util.ArrayList; + + +@Service +public class CustomerFormViewServiceImpl implements CustomerFormViewService { + + @Autowired + CustomerFormViewMapper customerFormViewMapper; + + @Override + public ArrayList getAppsByGroupId(CustomerFormGroup item) { + return customerFormViewMapper.getAppsByGroupId(item.getId()); + } +} diff --git a/src/main/resources/mapper/AppmenusMapper.xml b/src/main/resources/mapper/AppmenusMapper.xml index a5a84ad..97adeb4 100644 --- a/src/main/resources/mapper/AppmenusMapper.xml +++ b/src/main/resources/mapper/AppmenusMapper.xml @@ -7,7 +7,12 @@ diff --git a/src/main/resources/mapper/CustomerFormMapper.xml b/src/main/resources/mapper/CustomerFormMapper.xml index 9373a39..2a6539d 100644 --- a/src/main/resources/mapper/CustomerFormMapper.xml +++ b/src/main/resources/mapper/CustomerFormMapper.xml @@ -7,7 +7,7 @@ diff --git a/src/main/resources/mapper/CustomerFormvViewMapper.xml b/src/main/resources/mapper/CustomerFormvViewMapper.xml index ce39a2f..8321c85 100644 --- a/src/main/resources/mapper/CustomerFormvViewMapper.xml +++ b/src/main/resources/mapper/CustomerFormvViewMapper.xml @@ -10,7 +10,7 @@ select id,tablekey,version,status,time,creater,edit_time,table_structure,dict,cfid,name,classify,flowkey,signCode from customer_form_view - where status = 1 and tablekey in + where status = 1 and states = 1 and tablekey in #{tablekey} @@ -22,7 +22,7 @@ select id,tablekey,version,status,time,creater,edit_time,table_structure,dict,cfid,name,classify,flowkey,signCode from customer_form_view - where status = 1 and classify = 4 and groupid = #{groupid} + where status = 1 and states = 1 and classify = 4 and groupid = #{groupid} order by id @@ -31,7 +31,7 @@ select id,tablekey,version,status,time,creater,edit_time,table_structure,dict,cfid,name,classify,flowkey,signCode,mastesformjson from customer_form_view - where status = 1 and cfid = #{formId} + where status = 1 and states = 1 and cfid = #{formId} + + \ No newline at end of file