Merge branch 'master' of http://49.234.186.218:9000/root/ieplus

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzAgentServiceImpl.java

@@ -4,6 +4,7 @@ import java.util.Collection;
 import java.util.List;
 
 import com.ruoyi.common.core.domain.entity.SysUser;
+import com.ruoyi.common.utils.NumberUtils;
 import com.ruoyi.common.utils.SecurityUtils;
 import com.ruoyi.enums.UserTypeEnum;
 import com.ruoyi.system.service.ISysUserService;
@@ -75,7 +76,7 @@ public class DzAgentServiceImpl implements IDzAgentService
     @Override
     public int insertDzAgent(DzAgent dzAgent)
     {
-        Long userId = userService.insertRelateUser(UserTypeEnum.Agent, dzAgent.getAgentId(), dzAgent.getDeptId(), dzAgent.getUsername(), dzAgent.getName());
+        Long userId = userService.insertRelateUser(UserTypeEnum.Agent, dzAgent.getAgentId(), NumberUtils.isPositive(dzAgent.getParentId()) ? "SubAgent" : null, dzAgent.getDeptId(), dzAgent.getUsername(), dzAgent.getName());
 
         dzAgent.setUserId(userId);
         int iRet = dzAgentMapper.insertDzAgent(dzAgent);

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzSchoolServiceImpl.java

@@ -68,7 +68,7 @@ public class DzSchoolServiceImpl implements IDzSchoolService
         dzSchoolMapper.insertDzSchool(dzSchool);
         if(null != dzSchool.getDeptId() && dzSchool.getDeptId() > 0) {
             Long campusId = dzSchool.getId();
-            Long userId = userService.insertRelateUser(UserTypeEnum.School, campusId, dzSchool.getDeptId(), dzSchool.getName(), dzSchool.getName());
+            Long userId = userService.insertRelateUser(UserTypeEnum.School, campusId, null, dzSchool.getDeptId(), dzSchool.getName(), dzSchool.getName());
             dzSchool.setUserId(userId);
             dzSchoolMapper.updateDzSchool(dzSchool);
         }

ie-system/src/main/java/com/ruoyi/dz/service/impl/DzTeacherServiceImpl.java

@@ -87,7 +87,7 @@ public class DzTeacherServiceImpl implements IDzTeacherService
         }
         dzTeacherMapper.insertDzTeacher(dzTeacher);//将老师的userId填充到user的userName中
         Long teacherId = dzTeacher.getTeacherId();
-        Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), dzTeacher.getDeptId(), String.valueOf(teacherId), dzTeacher.getName());
+        Long userId = userService.insertRelateUser(UserTypeEnum.Teacher, dzTeacher.getTeacherId(), null, dzTeacher.getDeptId(), String.valueOf(teacherId), dzTeacher.getName());
         //反向更新dzTeacher中的userId
         dzTeacher.setUserId(userId);
         if (StringUtils.isEmpty(dzTeacher.getName())){

ie-system/src/main/java/com/ruoyi/system/service/ISysRoleService.java

@@ -172,5 +172,5 @@ public interface ISysRoleService
      */
     public int insertAuthUsers(Long roleId, Long[] userIds);
 
-    public SysRole selectRoleByUserType(UserTypeEnum userType);
+    public SysRole selectRoleByRoleKey(String roleKey);
 }

ie-system/src/main/java/com/ruoyi/system/service/ISysUserService.java

@@ -230,7 +230,7 @@ public interface ISysUserService
      */
     public String importUser(List<SysUser> userList, Boolean isUpdateSupport, String operName);
 
-    public Long insertRelateUser(UserTypeEnum userType, Long userTypeId, Long deptId, String userName, String nickName);
+    public Long insertRelateUser(UserTypeEnum userType, Long userTypeId, String role, Long deptId, String userName, String nickName);
 
     /**
      * 查询所有非空的省份列表（去重）

ie-system/src/main/java/com/ruoyi/system/service/impl/SysDeptServiceImpl.java

@@ -225,7 +225,7 @@ public class SysDeptServiceImpl implements ISysDeptService
         }
         dept.setAncestors(info.getAncestors() + "," + dept.getParentId());
         int iRet = deptMapper.insertDept(dept);
-        userService.insertRelateUser(UserTypeEnum.Institution, dept.getDeptId(), dept.getDeptId(), dept.getUsername(), dept.getDeptName());
+        userService.insertRelateUser(UserTypeEnum.Institution, dept.getDeptId(), null, dept.getDeptId(), dept.getUsername(), dept.getDeptName());
         return iRet;
     }
 

ie-system/src/main/java/com/ruoyi/system/service/impl/SysRoleServiceImpl.java

@@ -429,13 +429,13 @@ public class SysRoleServiceImpl implements ISysRoleService
     }
 
     @Override
-    public SysRole selectRoleByUserType(UserTypeEnum userType) {
+    public SysRole selectRoleByRoleKey(String roleKey) {
         SysRole cond = new SysRole();
-        cond.setRoleKey(userType.name().toLowerCase());//Teacher转换为数据库对应的teacher
+        cond.setRoleKey(roleKey.toLowerCase());//Teacher转换为数据库对应的teacher
         List<SysRole> roleList = roleMapper.selectRoleList(cond);
         if (CollectionUtils.isEmpty(roleList))
         {
-            throw new ServiceException(String.format("%1$s未定义角色", userType.name()));
+            throw new ServiceException(String.format("%1$s未定义角色", roleKey));
         }
         return roleList.get(0);
     }

ie-system/src/main/java/com/ruoyi/system/service/impl/SysUserServiceImpl.java

@@ -633,7 +633,7 @@ public class SysUserServiceImpl implements ISysUserService
     }
 
     @Override
-    public Long insertRelateUser(UserTypeEnum userType, Long userTypeId, Long deptId, String userName, String nickName) {
+    public Long insertRelateUser(UserTypeEnum userType, Long userTypeId, String role, Long deptId, String userName, String nickName) {
         SysUser user = new SysUser();
         user.setDeptId(deptId);
         user.setUserName(StringUtils.isEmpty(userName)?nickName:userName);
@@ -645,7 +645,7 @@ public class SysUserServiceImpl implements ISysUserService
 //        user.setPassword2(RandomUtil.randomNumbers(6));
         user.setPassword2(pwd);
         user.setPassword(SecurityUtils.encryptPassword(pwd));
-        user.setRoleIds(new Long[] {roleService.selectRoleByUserType(userType).getRoleId()});
+        user.setRoleIds(new Long[] {roleService.selectRoleByRoleKey(StringUtils.isBlank(role) ? userType.name() : role).getRoleId()});
         insertUser(user);
         return user.getUserId();
     }