电签相关

blade-service/blade-business/src/main/java/org/springblade/business/controller/UserOpinionController.java

@@ -298,7 +298,7 @@ public class UserOpinionController extends BladeController {
 		//获取当前登录人
 		BladeUser user = AuthUtil.getUser();
 		userOpinion.setCreateUser(user.getUserId());
-		userOpinion.setCreateUserName(user.getUserName());
+		userOpinion.setCreateUserName(user.getRoleName());
 		userOpinion.setCreateDept(user.getDeptId().contains(",") ? Long.parseLong(user.getDeptId().split(",")[0]) : Long.parseLong(user.getDeptId()));
 	}
 }

blade-service/blade-manager/src/main/java/org/springblade/manager/controller/SignPfxFileController.java

@@ -37,6 +37,7 @@ import org.springblade.manager.service.*;
 import org.springblade.manager.vo.*;
 import org.springblade.system.entity.Role;
 import org.springblade.system.feign.ISysClient;
+import org.springblade.system.user.entity.User;
 import org.springblade.system.vo.RoleVO;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.bind.annotation.RequestParam;
@@ -73,6 +74,29 @@ public class SignPfxFileController extends BladeController {
 
 	private final ISignPfxDeputyService signPfxDeputyService;
 
+	/**
+	 * 获取当前系统下分配的一级角色
+	 * @return 结果
+	 */
+	@GetMapping("/queryRole")
+	@ApiOperationSupport(order = 12)
+	@ApiOperation(value = "获取当前系统下分配的一级角色")
+	public R<List<RoleVO>> queryRole(){
+		 return R.data(this.sysClient.search().getData());
+	}
+
+	/**
+	 * 获取当前系统下所有用户
+	 * @return 结果
+	 */
+	@GetMapping("/findUserByName")
+	@ApiOperationSupport(order = 11)
+	@ApiOperation(value = "获取当前系统下所有用户")
+	public R<List<User>> findUserByName(){
+		return R.data(this.contractInfoService.findUserByName(""));
+	}
+
+
 	/**
 	 * 获取当前项目及其所有合同段
 	 * @return 项目及合同段列表