根据站点ID创建账号,角色针对表格及表单的栏位显示限制

src/custom/restcontroller/webmanage/role/SQL/角色修改.sql

@@ -4,5 +4,6 @@ remarks=$remarks$,
 usertype=$usertype$,
 isshieldinfo=$isshieldinfo$,
 changeby=$changeby$,
-changedate=now()
+changedate=now(),
+fielddatatypelimit=$fielddatatypelimit$
 where roleid=$roleid$

src/custom/restcontroller/webmanage/role/SQL/角色新增.sql

@@ -1,2 +1,2 @@
-insert into sys_role(roleid, rolename, remarks, usertype, issystem, createby, createdate, siteid,isshieldinfo)
-values($roleid$, $rolename$, $remarks$, $usertype$, 0, $createby$, now(), $siteid$,$isshieldinfo$)
+insert into sys_role(roleid, rolename, remarks, usertype, issystem, createby, createdate, siteid,isshieldinfo,fielddatatypelimit)
+values($roleid$, $rolename$, $remarks$, $usertype$, 0, $createby$, now(), $siteid$,$isshieldinfo$,$fielddatatypelimit$)

src/custom/restcontroller/webmanage/role/SQL/角色详情查询.sql

@@ -1,2 +1,15 @@
-select t1.roleid, t1.rolename, t1.remarks,t1.usertype,t1.issystem,t1.isshieldinfo, t1.createby, t1.createdate, t1.changeby, t1.changedate, t1.siteid from sys_role t1
-where t1.siteid=$siteid$ and t1.roleid=$roleid$
+select t1.roleid,
+       t1.rolename,
+       t1.remarks,
+       t1.usertype,
+       t1.issystem,
+       t1.isshieldinfo,
+       t1.createby,
+       t1.createdate,
+       t1.changeby,
+       t1.changedate,
+       t1.siteid,
+       t1.fielddatatypelimit
+from sys_role t1
+where t1.siteid = $siteid$
+  and t1.roleid = $roleid$

src/custom/restcontroller/webmanage/role/role.java

@@ -111,6 +111,10 @@ public class role extends Controller {
         String rolename = content.getString("rolename", "sys_role");
         String remarks = content.getString("remarks", "sys_role");
         String usertype = content.getString("usertype", "sys_role");
+        JSONArray fielddatatypelimit = content.getJSONArray("fielddatatypelimit");
+        if (fielddatatypelimit == null) {
+            fielddatatypelimit = new JSONArray();
+        }
         SQLFactory sqlFactory = null;
         if (roleid <= 0 || dbConnect.runSqlQuery("select roleid from sys_role where roleid=" + roleid).isEmpty()) {
             roleid = createTableID("sys_role");
@@ -121,6 +125,7 @@ public class role extends Controller {
             sqlFactory.addParameter("rolename", rolename);
             sqlFactory.addParameter("remarks", remarks);
             sqlFactory.addParameter("usertype", usertype);
+            sqlFactory.addParameter("fielddatatypelimit", fielddatatypelimit);
             sqlFactory.addParameter("createby", username);
 
             content.put("roleid", roleid);
@@ -135,6 +140,7 @@ public class role extends Controller {
             sqlFactory.addParameter("remarks", remarks);
             sqlFactory.addParameter("usertype", usertype);
             sqlFactory.addParameter("changeby", username);
+            sqlFactory.addParameter("fielddatatypelimit", fielddatatypelimit);
         }
         dbConnect.runSqlUpdate(sqlFactory);
         return query_roleMain();

src/custom/restcontroller/webmanage/sale/enterprise/enterprise.java

@@ -409,7 +409,7 @@ public class enterprise extends Controller {
         return getSucReturnObject().setData(enterpriseRows.isNotEmpty() ? enterpriseRows.get(0) : new Row()).toString();
     }
 
-    @API(title = "商户档案新增修改", apiversion = R.ID20220920084101.v1.class,intervaltime = 200)
+    @API(title = "商户档案新增修改", apiversion = R.ID20220920084101.v1.class, intervaltime = 200)
     @CACHEING_CLEAN(cms = {@cm(clazz = enterprise.class, method = {"query_enterpriseList", "query_enterpriseMain"}),
             @cm(clazz = restcontroller.sale.enterprise.enterprise.class, method = {"query_enterpriseMain"})},
             apiversions = {R.ID20221011133602.class},
@@ -432,9 +432,9 @@ public class enterprise extends Controller {
         sqlFactory.addParameter("enterprisename", content.getStringValue("enterprisename", tablename));
         sqlFactory.addParameter("address", content.getStringValue("address", tablename));
         sqlFactory.addParameter("contact", content.getStringValue("contact", tablename));
-        Rows rows =dbConnect.runSqlQuery("select t1.sys_enterpriseid,t2.agentnum from sys_enterprise t1 left join sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid where t1.sys_enterpriseid!="+sys_enterpriseid+" and t1.siteid='"+siteid+"' and t1.phonenumber='"+ content.getStringValue("phonenumber", tablename)+"'");
-        if(!rows.isEmpty()){
-            return getErrReturnObject().setErrMsg("与经销商编码"+rows.get(0).getString("agentnum")+"联系方式重复，无法保存").toString();
+        Rows rows = dbConnect.runSqlQuery("select t1.sys_enterpriseid,t2.agentnum from sys_enterprise t1 left join sa_agents t2 on t1.sys_enterpriseid=t2.sys_enterpriseid and t1.siteid=t2.siteid where t1.sys_enterpriseid!=" + sys_enterpriseid + " and t1.siteid='" + siteid + "' and t1.phonenumber='" + content.getStringValue("phonenumber", tablename) + "'");
+        if (!rows.isEmpty()) {
+            return getErrReturnObject().setErrMsg("与经销商编码" + rows.get(0).getString("agentnum") + "联系方式重复，无法保存").toString();
         }
         sqlFactory.addParameter("phonenumber", content.getStringValue("phonenumber", tablename));
         sqlFactory.addParameter("province", content.getStringValue("province", tablename));
@@ -580,7 +580,7 @@ public class enterprise extends Controller {
         if (agentRows.isEmpty()) {
             User.createUser(this, sys_enterpriseid, enterprisename, phonenumber, true, "负责人", 21, defaultroleids, enterprisename);
         } else {
-            User.createUser(this, sys_enterpriseid, agentRows.get(0).getString("agentnum"), enterprisename, phonenumber, true, "负责人", 21, defaultroleids, enterprisename);
+            User.createUser(this, sys_enterpriseid, siteid + "" + agentRows.get(0).getString("agentnum"), enterprisename, phonenumber, true, "负责人", 21, defaultroleids, enterprisename);
         }
         return getSucReturnObject().toString();
     }

src/custom/restcontroller/webmanage/users/users.java

@@ -141,7 +141,7 @@ public class users extends Controller {
         String changename = content.getString("name", "sys_users");
         String changephonenumber = content.getString("phonenumber", "sys_users");
         String changeremarks = content.getString("remarks", "sys_users");
-        String accountno = content.getStringValue("accountno");
+        String accountno = siteid + content.getStringValue("accountno");
         JSONArray roleids = content.getJSONArray("roleids");
 
 
@@ -176,7 +176,7 @@ public class users extends Controller {
             if (accountno.isEmpty()) {
                 createUserFactory = new CreateUserFactory(this, changename, changephonenumber, usertype, roleidslist.toArray(new Long[]{}), changeremarks);
             } else {
-                if (dbConnect.runSqlQuery("SELECT 1 from sys_users WHERE  accountno ='"+accountno+"' ").isNotEmpty()) {
+                if (dbConnect.runSqlQuery("SELECT 1 from sys_users WHERE  accountno ='" + accountno + "' ").isNotEmpty()) {
                     return getErrReturnObject().setErrMsg("当前账号【" + accountno + "】已存在").toString();
                 }
                 createUserFactory = new CreateUserFactory(this, accountno, changename, changephonenumber, usertype, roleidslist.toArray(new Long[]{}), changeremarks);