|
|
@@ -70,25 +70,26 @@ public class team extends Controller {
|
|
|
String email = content.getString("email", "sys_enterprise_hr");
|
|
|
String position = content.getString("position", "sys_enterprise_hr");
|
|
|
String remarks = content.getString("remarks", "sys_enterprise_hr");
|
|
|
- JSONArray roleidsArray = content.getJSONArray("roleids");
|
|
|
+ Long roleid = content.getLong("roleid");
|
|
|
|
|
|
- int usertype = 22;//经销商子账号用户类型
|
|
|
+// int usertype = 22;//经销商子账号用户类型
|
|
|
ArrayList<Long> newroleidList = new ArrayList<>();
|
|
|
- for (Object o : roleidsArray) {
|
|
|
- Long id = Long.parseLong(String.valueOf(o));
|
|
|
- /*
|
|
|
- 判断角色id是否为经销商所属的角色
|
|
|
- */
|
|
|
- if (dbConnect.runSqlQuery("select *from sys_role where siteid='" + siteid + "' and sys_enterpriseid='" + sys_enterpriseid + "'").isEmpty()) {
|
|
|
- return getErrReturnObject().setErrMsg("所选角色不是有效的角色信息").toString();
|
|
|
- }
|
|
|
- newroleidList.add(id);
|
|
|
- }
|
|
|
+ newroleidList.add(roleid);
|
|
|
+// for (Object o : roleidsArray) {
|
|
|
+// Long id = Long.parseLong(String.valueOf(o));
|
|
|
+// /*
|
|
|
+// 判断角色id是否为经销商所属的角色
|
|
|
+// */
|
|
|
+// if (dbConnect.runSqlQuery("select *from sys_role where siteid='" + siteid + "' and sys_enterpriseid='" + sys_enterpriseid + "'").isEmpty()) {
|
|
|
+// return getErrReturnObject().setErrMsg("所选角色不是有效的角色信息").toString();
|
|
|
+// }
|
|
|
+// newroleidList.add(id);
|
|
|
+// }
|
|
|
/*
|
|
|
根据用户类型查找新账号默认角色
|
|
|
*/
|
|
|
- Rows defaultrole = dbConnect.runSqlQuery("select roleid from sys_role where siteid='" + siteid + "' and usertype='" + usertype + "' and issystem=1");
|
|
|
- newroleidList.addAll(defaultrole.toArrayList("roleid", new ArrayList<>()));
|
|
|
+// Rows defaultrole = dbConnect.runSqlQuery("select roleid from sys_role where siteid='" + siteid + "' and usertype='" + usertype + "' and issystem=1");
|
|
|
+// newroleidList.addAll(defaultrole.toArrayList("roleid", new ArrayList<>()));
|
|
|
Rows sys_enterprise_hrRows = dbConnect.runSqlQuery("select userid from sys_enterprise_hr where siteid='" + siteid + "'and sys_enterpriseid='" + sys_enterpriseid + "' and sys_enterprise_hrid=" + sys_enterprise_hrid);
|
|
|
if (sys_enterprise_hrid <= 0 || sys_enterprise_hrRows.isEmpty()) {
|
|
|
User.createUser(this, sys_enterpriseid, name, phonenumber, false, position, 21, newroleidList.toArray(new Long[]{}), "");
|