diff --git a/WebContent/AppConfig/MenuManage/AppMenuInfoList.jsp b/WebContent/AppConfig/MenuManage/AppMenuInfoList.jsp
new file mode 100644
index 000000000..ca4042755
--- /dev/null
+++ b/WebContent/AppConfig/MenuManage/AppMenuInfoList.jsp
@@ -0,0 +1,47 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/Frame/resources/include/include_begin_list.jspf"%><%
+ /*
+ Author: undefined 2020-07-14
+ Content:
+ History Log:
+ */
+ ASObjectModel doTemp = new ASObjectModel("AppMenuInfoList");
+ ASObjectWindow dwTemp = new ASObjectWindow(CurPage,doTemp,request);
+ dwTemp.Style="1"; //--设置为Grid风格--
+ dwTemp.ReadOnly = "1"; //只读模式
+ dwTemp.setPageSize(10);
+ dwTemp.genHTMLObjectWindow("");
+
+ //0、是否展示 1、 权限控制 2、 展示类型 3、按钮显示名称 4、按钮解释文字 5、按钮触发事件代码 6、 7、 8、 9、图标,CSS层叠样式 10、风格
+ String sButtons[][] = {
+ {"false","All","Button","新增","新增","newRecord()","","","","btn_icon_add",""},
+ {"false","","Button","详情","详情","viewAndEdit()","","","","btn_icon_detail",""},
+ {"false","","Button","删除","删除","if(confirm('确实要删除吗?'))as_delete(0,'alert(getRowCount(0))')","","","","btn_icon_delete",""},
+ {"true","All","Button","配置可见角色","","selectMenuRoles()","","","","btn_icon_setting"},
+ };
+%><%@include file="/Frame/resources/include/ui/include_list.jspf"%>
+
+<%@ include file="/Frame/resources/include/include_end.jspf"%>
\ No newline at end of file
diff --git a/WebContent/AppConfig/MenuManage/AppSelectMenuRoleTree.jsp b/WebContent/AppConfig/MenuManage/AppSelectMenuRoleTree.jsp
new file mode 100644
index 000000000..d99160421
--- /dev/null
+++ b/WebContent/AppConfig/MenuManage/AppSelectMenuRoleTree.jsp
@@ -0,0 +1,76 @@
+<%@ page contentType="text/html; charset=GBK"%>
+<%@ include file="/IncludeBeginMD.jsp"%>
+<%
+ //获得页面参数
+ String roleId = CurPage.getParameter("roleId"); //角色编号
+ String roleName = CurPage.getParameter("roleName"); //角色名称
+ if (roleId == null) roleId = "";
+ if (roleName == null) roleName = "";
+%>
+
+
+
+
+
+
+
+
+
+
+ | <%=new Button("确定","保存权限定义信息","saveConfig()","","").getHtmlText()%> |
+
+
+ |
+
+
+ |
+
+ |
+
+
+
+
+
+<%@ include file="/IncludeEnd.jsp"%>
\ No newline at end of file
diff --git a/src/com/amarsoft/app/awe/config/role/action/ManageRoleMenuRela.java b/src/com/amarsoft/app/awe/config/role/action/ManageRoleMenuRela.java
index 24d103f1e..29288b871 100644
--- a/src/com/amarsoft/app/awe/config/role/action/ManageRoleMenuRela.java
+++ b/src/com/amarsoft/app/awe/config/role/action/ManageRoleMenuRela.java
@@ -86,4 +86,27 @@ public class ManageRoleMenuRela {
}
return "SUCCEEDED";
}
+
+
+ /**
+ * app角色配置菜单
+ * @return
+ * @throws Exception
+ */
+ public String appAddMenuRoles(JBOTransaction tx) throws Exception{
+ BizObjectManager manager = JBOFactory.getBizObjectManager("jbo.awe.APP_ROLE_MENU", tx);
+ //删除指定菜单与角色的关联
+ manager.createQuery("DELETE FROM O WHERE roleid = :roleid").setParameter("roleid", roleID).executeUpdate();
+ if(relaValues != null){
+ //再将新关联关系插入
+ String[] menuIds = relaValues.split("@");
+ for(int i=0; i armList = manager.createQuery("roleid = :roleid").setParameter("roleid", roleID).getResultList(false);
+ for (BizObject arm : armList) {
+ BizObjectManager amiManage = JBOFactory.getBizObjectManager("jbo.awe.APP_MENU_INFO");
+ BizObject ami = amiManage.createQuery("menuid = :menuid").setParameter("menuid", arm.getAttribute("MenuID").getString()).getSingleResult(false);
+ if(ami!=null && ami.getAttribute("displayname")!=null){
+ sb.append(ami.getAttribute("displayname").getString()).append(",");
+ }
+ }
+ if( sb.length() == 0 ){
+ return "";
+ }else{
+ return sb.substring(0, sb.length()-1);
+ }
+ }
+
+}
diff --git a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java
index 0bac2eaa6..fca7fdbcb 100644
--- a/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java
+++ b/src_app_fresh/apx/com/amarsoft/als/apzl/apply/business/data/service/impl/BusinessDataServiceImpl.java
@@ -41,10 +41,10 @@ public class BusinessDataServiceImpl implements BusinessDataService {
.readRequestParam(request, "UTF-8");
fieldMap = (Map) testMap.get("fieldMap"); // 参数
String userId = fieldMap.get("userid") == null ? "" : fieldMap.get("userid").toString();
- String sql = "SELECT 'BusinessApplyFlow' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='BusinessApplyFlow' AND ft.userid='"+userId+"' "
- + "UNION ALL SELECT 'BContractApproveFlow' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='BContractApproveFlow' AND ft.userid='"+userId+"' "
- + "UNION ALL SELECT 'FundPaymentCarFlow' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='FundPaymentCarFlow' AND ft.userid='"+userId+"' "
- + "UNION ALL SELECT 'MortgageFileFlow' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='MortgageFileFlow' AND ft.userid='"+userId+"' ";
+ String sql = "SELECT 'BusinessApplyApply' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='BusinessApplyFlow' AND ft.userid='"+userId+"' "
+ + "UNION ALL SELECT 'BContractApproveApply' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='BContractApproveFlow' AND ft.userid='"+userId+"' "
+ + "UNION ALL SELECT 'FundPaymentCarApply' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='FundPaymentCarFlow' AND ft.userid='"+userId+"' "
+ + "UNION ALL SELECT 'MortgageFileApply' as flowname,COUNT(*) as number FROM flow_object fo, (SELECT objectno,userid FROM flow_task GROUP BY objectno,phaseno HAVING phaseno='0010') ft WHERE fo.objectno=ft.objectno AND fo.phaseno='0010' AND fo.flowno='MortgageFileFlow' AND ft.userid='"+userId+"' ";
List