|
@@ -17,6 +17,7 @@ import com.ydtech.modules.admin.model.dto.AgentUserDto;
|
|
|
import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
|
|
import com.ydtech.modules.admin.model.dto.QuTeamNumDto;
|
|
|
import com.ydtech.modules.admin.model.dto.QuUserNumDto;
|
|
import com.ydtech.modules.admin.model.dto.QuUserNumDto;
|
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
import com.ydtech.modules.admin.model.dto.SysUserDto;
|
|
|
|
|
+import com.ydtech.modules.admin.model.po.SysUserIsDial;
|
|
|
import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
|
|
import com.ydtech.modules.admin.model.po.SysUserTreeShowLevel;
|
|
|
import com.ydtech.modules.admin.model.vo.*;
|
|
import com.ydtech.modules.admin.model.vo.*;
|
|
|
import com.ydtech.modules.admin.service.*;
|
|
import com.ydtech.modules.admin.service.*;
|
|
@@ -83,6 +84,9 @@ public class SysUserController extends BaseController {
|
|
|
|
|
|
|
|
private final InsUploadFilesService insUploadFilesService;
|
|
private final InsUploadFilesService insUploadFilesService;
|
|
|
|
|
|
|
|
|
|
+ private final SysUserIsDialService sysUserIsDialService;
|
|
|
|
|
+
|
|
|
|
|
+
|
|
|
// @PreAuthorize("hasAuthority('sys:user:delete')")
|
|
// @PreAuthorize("hasAuthority('sys:user:delete')")
|
|
|
@ApiOperation(value = "逻辑删除")
|
|
@ApiOperation(value = "逻辑删除")
|
|
|
@PostMapping(value = "/deleteFlag")
|
|
@PostMapping(value = "/deleteFlag")
|
|
@@ -148,7 +152,7 @@ public class SysUserController extends BaseController {
|
|
|
*/
|
|
*/
|
|
|
@PostMapping(value = "/saveUserRole")
|
|
@PostMapping(value = "/saveUserRole")
|
|
|
@Transactional
|
|
@Transactional
|
|
|
- public HttpResult saveUserRole(@RequestParam String userId, @RequestParam String roleId, @RequestParam String showLevel) {
|
|
|
|
|
|
|
+ public HttpResult saveUserRole(@RequestParam String userId, @RequestParam String roleId, @RequestParam String showLevel, @RequestParam String isDial) {
|
|
|
SysUserRole userRole = new SysUserRole();
|
|
SysUserRole userRole = new SysUserRole();
|
|
|
sysUserRoleService.deleteByUserId(userId);
|
|
sysUserRoleService.deleteByUserId(userId);
|
|
|
String userName = getUserName();
|
|
String userName = getUserName();
|
|
@@ -167,6 +171,15 @@ public class SysUserController extends BaseController {
|
|
|
sysUserTreeShowLevel.setCreateTime(new Date());
|
|
sysUserTreeShowLevel.setCreateTime(new Date());
|
|
|
sysUserTreeShowLevelService.save(sysUserTreeShowLevel);
|
|
sysUserTreeShowLevelService.save(sysUserTreeShowLevel);
|
|
|
}
|
|
}
|
|
|
|
|
+ if (!"".equals(isDial)) {
|
|
|
|
|
+ sysUserIsDialService.remove(new LambdaQueryWrapper<SysUserIsDial>().eq(SysUserIsDial::getUserId, userId));
|
|
|
|
|
+ SysUserIsDial sysUserIsDial = new SysUserIsDial();
|
|
|
|
|
+ sysUserIsDial.setUserId(userId);
|
|
|
|
|
+ sysUserIsDial.setIsDial(isDial);
|
|
|
|
|
+ sysUserIsDial.setCreateName(userName);
|
|
|
|
|
+ sysUserIsDial.setCreateTime(new Date());
|
|
|
|
|
+ sysUserIsDialService.save(sysUserIsDial);
|
|
|
|
|
+ }
|
|
|
return HttpResult.ok();
|
|
return HttpResult.ok();
|
|
|
}
|
|
}
|
|
|
|
|
|