组织架构适应
parent
071a7420f5
commit
2f8d4b5842
Binary file not shown.
Binary file not shown.
Binary file not shown.
|
@ -1,3 +1,3 @@
|
||||||
#save ini
|
#save ini
|
||||||
#Wed Nov 08 00:36:33 CST 2023
|
#Sun Nov 12 23:09:04 CST 2023
|
||||||
deploystamp=1612237236000
|
deploystamp=1612237236000
|
||||||
|
|
|
@ -198,8 +198,26 @@ public class SatisfacTion {
|
||||||
queryString = "";
|
queryString = "";
|
||||||
}
|
}
|
||||||
if (query == 2) {
|
if (query == 2) {
|
||||||
|
//说明进来的分公司经理的角色 这个时候需要去我们配置的地方查询一下啊 看看有几个分公司 要是配置没有的话 就取查询出来的权限
|
||||||
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select * from RUSH_CRMCOMP_TO_USER_RELATION where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and a.org_id in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("crmcompanyid") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
queryString=" and a.org_id="+orgauth;
|
queryString=" and a.org_id="+orgauth;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (query == 3) {
|
if (query == 3) {
|
||||||
queryString = " and 1=0";
|
queryString = " and 1=0";
|
||||||
}
|
}
|
||||||
|
@ -278,8 +296,26 @@ public class SatisfacTion {
|
||||||
queryString = "";
|
queryString = "";
|
||||||
}
|
}
|
||||||
if (query == 2) {
|
if (query == 2) {
|
||||||
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select crmcompanyid,org_short_name, parent_org_id pid from RUSH_CRMCOMP_TO_USER_RELATION a\n" +
|
||||||
|
"left join COMPANY_ORGANIZE b on a.crmcompanyid=b.org_id where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and company in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("org_short_name") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
queryString=" and company='"+orgname+"'";
|
queryString=" and company='"+orgname+"'";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (query == 3) {
|
if (query == 3) {
|
||||||
queryString = " and 1=0";
|
queryString = " and 1=0";
|
||||||
}
|
}
|
||||||
|
@ -848,8 +884,25 @@ public class SatisfacTion {
|
||||||
queryString = "";
|
queryString = "";
|
||||||
}
|
}
|
||||||
if (query == 2 || query == 4) {
|
if (query == 2 || query == 4) {
|
||||||
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select * from RUSH_CRMCOMP_TO_USER_RELATION where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and c.org_id in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("crmcompanyid") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
queryString=" and c.org_id="+orgauth;
|
queryString=" and c.org_id="+orgauth;
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (query == 3) {
|
if (query == 3) {
|
||||||
queryString = "and 1=0";
|
queryString = "and 1=0";
|
||||||
}
|
}
|
||||||
|
@ -933,7 +986,25 @@ public class SatisfacTion {
|
||||||
queryString = "and h.org_name is not null";
|
queryString = "and h.org_name is not null";
|
||||||
}
|
}
|
||||||
if (query == 2) {
|
if (query == 2) {
|
||||||
queryString = " and h.org_name='" + orgname + "' and h.org_name is not null";
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select crmcompanyid,org_short_name, parent_org_id pid from RUSH_CRMCOMP_TO_USER_RELATION a\n" +
|
||||||
|
"left join COMPANY_ORGANIZE b on a.crmcompanyid=b.org_id where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and h.org_name in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("org_short_name") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
queryString=" and h.org_name='"+orgname+"'";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if (query == 3) {
|
if (query == 3) {
|
||||||
queryString = " and 1=0";
|
queryString = " and 1=0";
|
||||||
|
@ -1134,8 +1205,25 @@ public class SatisfacTion {
|
||||||
queryString = "";
|
queryString = "";
|
||||||
}
|
}
|
||||||
if (query == 2) {
|
if (query == 2) {
|
||||||
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select crmcompanyid,org_short_name, parent_org_id pid from RUSH_CRMCOMP_TO_USER_RELATION a\n" +
|
||||||
|
"left join COMPANY_ORGANIZE b on a.crmcompanyid=b.org_id where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and org_name in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("org_short_name") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
queryString=" and org_name='"+orgname+"'";
|
queryString=" and org_name='"+orgname+"'";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (query == 3) {
|
if (query == 3) {
|
||||||
queryString = " and 1=0";
|
queryString = " and 1=0";
|
||||||
}
|
}
|
||||||
|
@ -1497,8 +1585,26 @@ public List<Map> zql(Params params) {
|
||||||
queryString = "";
|
queryString = "";
|
||||||
}
|
}
|
||||||
if (query == 2) {
|
if (query == 2) {
|
||||||
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select crmcompanyid,org_short_name, parent_org_id pid from RUSH_CRMCOMP_TO_USER_RELATION a\n" +
|
||||||
|
"left join COMPANY_ORGANIZE b on a.crmcompanyid=b.org_id where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and org_name in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("org_short_name") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
queryString=" and org_name='"+orgname+"'";
|
queryString=" and org_name='"+orgname+"'";
|
||||||
}
|
}
|
||||||
|
}
|
||||||
if (query == 3) {
|
if (query == 3) {
|
||||||
queryString = " and 1=0";
|
queryString = " and 1=0";
|
||||||
}
|
}
|
||||||
|
|
|
@ -79,8 +79,27 @@ public class RushCompany {
|
||||||
queryString="";
|
queryString="";
|
||||||
}
|
}
|
||||||
if(query==2){
|
if(query==2){
|
||||||
|
//说明进来的分公司经理的角色 这个时候需要去我们配置的地方查询一下啊 看看有几个分公司 要是配置没有的话 就取查询出来的权限
|
||||||
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select * from RUSH_CRMCOMP_TO_USER_RELATION where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and a.org_id in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("crmcompanyid") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
queryString=" and a.org_id="+orgauth;
|
queryString=" and a.org_id="+orgauth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
}
|
||||||
if(query==3){
|
if(query==3){
|
||||||
queryString=" and 1=0";
|
queryString=" and 1=0";
|
||||||
}
|
}
|
||||||
|
@ -497,8 +516,28 @@ public class RushCompany {
|
||||||
queryString="";
|
queryString="";
|
||||||
}
|
}
|
||||||
if(query==2||query==4){
|
if(query==2||query==4){
|
||||||
|
//说明进来的分公司经理的角色 这个时候需要去我们配置的地方查询一下啊 看看有几个分公司 要是配置没有的话 就取查询出来的权限
|
||||||
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select * from RUSH_CRMCOMP_TO_USER_RELATION where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and org_id in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("crmcompanyid") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
queryString=" and org_id="+orgauth;
|
queryString=" and org_id="+orgauth;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
if(query==3){
|
if(query==3){
|
||||||
queryString="and 1=0";
|
queryString="and 1=0";
|
||||||
}
|
}
|
||||||
|
@ -819,7 +858,25 @@ public class RushCompany {
|
||||||
queryString="";
|
queryString="";
|
||||||
}
|
}
|
||||||
if(query==2){
|
if(query==2){
|
||||||
queryString=" and org_id="+orgauth;
|
String userid=SessionHelper.getCurrentUserId();
|
||||||
|
|
||||||
|
List<Map> orglist=DbHelper.getDbService().queryMapList("select crmcompanyid,org_short_name, parent_org_id pid from RUSH_CRMCOMP_TO_USER_RELATION a\n" +
|
||||||
|
"left join COMPANY_ORGANIZE b on a.crmcompanyid=b.org_id where RUSH_USERID=?",userid);
|
||||||
|
if(orglist.size()>0){
|
||||||
|
StringBuffer sb = new StringBuffer();
|
||||||
|
sb.append(" and company in (");
|
||||||
|
for(int i=0;i<orglist.size();i++){
|
||||||
|
sb.append("'" + orglist.get(i).get("org_short_name") + "'");
|
||||||
|
if (i < orglist.size() - 1) {
|
||||||
|
sb.append(",");
|
||||||
|
}
|
||||||
|
}
|
||||||
|
sb.append(")");
|
||||||
|
queryString=sb.toString();
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
queryString=" and company='"+orgname+"'";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
if(query==3){
|
if(query==3){
|
||||||
queryString=" and 1=0";
|
queryString=" and 1=0";
|
||||||
|
@ -944,7 +1001,7 @@ public class RushCompany {
|
||||||
+" round(decode(sum(case when cutstype = 1 then 1 else 0 end),0,0,sum(case when cutstype = 1 and state=1 then 1else 0 end)/count(1)* 100),0) as companybi , "
|
+" round(decode(sum(case when cutstype = 1 then 1 else 0 end),0,0,sum(case when cutstype = 1 and state=1 then 1else 0 end)/count(1)* 100),0) as companybi , "
|
||||||
+" round(decode(sum(case when cutstype = 0 then 1 else 0 end),0,0,sum(case when cutstype = 0 and state=1 then 1else 0 end)/count(1)* 100),2) as xitongbi, "
|
+" round(decode(sum(case when cutstype = 0 then 1 else 0 end),0,0,sum(case when cutstype = 0 and state=1 then 1else 0 end)/count(1)* 100),2) as xitongbi, "
|
||||||
+" round(decode( sum(case when state=1 then 1 else 0 end ),0,0, sum(case when state=1 then 1 else 0 end )/count(1)* 100),2) as yichulibi "
|
+" round(decode( sum(case when state=1 then 1 else 0 end ),0,0, sum(case when state=1 then 1 else 0 end )/count(1)* 100),2) as yichulibi "
|
||||||
+" from excustomer_info where 1=1 "+custtype+dateString+istaxsql+addsql+" group by org_name)) where company='"+orgname+"' ";
|
+" from excustomer_info where 1=1 "+custtype+dateString+istaxsql+addsql+" group by org_name)) where 1=1 "+queryString;
|
||||||
|
|
||||||
|
|
||||||
return DbHelper.getDbService().queryPageMapList(sqlString,params);
|
return DbHelper.getDbService().queryPageMapList(sqlString,params);
|
||||||
|
|
Loading…
Reference in New Issue