通济学校修改

blade-service-api/blade-school-api/src/main/java/org/springblade/school/entity/Salary.java

@@ -117,6 +117,18 @@ public class Salary implements Serializable {
 		@ApiModelProperty(value = "工资明细")
 		@TableField(exist = false)
 		private List<SalaryItem> salaryItemList;
+	/**
+	 * 创建人中文名
+	 */
+		@ApiModelProperty(value = "创建人中文名")
+		@TableField(exist = false)
+		private String createUserName;
+	/**
+	 * 修改人中文名
+	 */
+		@ApiModelProperty(value = "修改人中文名")
+		@TableField(exist = false)
+		private String updateUserName;
 
 
 }

blade-service/blade-school/pom.xml

@@ -44,6 +44,12 @@
             <groupId>org.springblade</groupId>
             <artifactId>blade-starter-transaction</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.springblade</groupId>
+            <artifactId>blade-user-api</artifactId>
+            <version>2.8.2.RELEASE</version>
+            <scope>compile</scope>
+        </dependency>
     </dependencies>
 
 

blade-service/blade-school/src/main/java/org/springblade/school/controller/SalaryController.java

@@ -16,6 +16,8 @@
  */
 package org.springblade.school.controller;
 
+import com.baomidou.mybatisplus.core.toolkit.CollectionUtils;
+import com.baomidou.mybatisplus.core.toolkit.StringUtils;
 import io.swagger.annotations.Api;
 import io.swagger.annotations.ApiOperation;
 import io.swagger.annotations.ApiParam;
@@ -28,6 +30,8 @@ import org.springblade.core.mp.support.Query;
 import org.springblade.core.secure.utils.SecureUtil;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.utils.Func;
+import org.springblade.system.user.entity.User;
+import org.springblade.system.user.feign.IUserClient;
 import org.springframework.web.bind.annotation.*;
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import org.springblade.school.entity.Salary;
@@ -48,6 +52,7 @@ import org.springblade.core.boot.ctrl.BladeController;
 public class SalaryController extends BladeController {
 
 	private final ISalaryService salaryService;
+	private final IUserClient userClient;
 
 	/**
 	 * 详情
@@ -70,6 +75,20 @@ public class SalaryController extends BladeController {
 	public R<IPage<Salary>> list(Salary salary, Query query) {
 		salary.setTenantId(SecureUtil.getTenantId());
 		IPage<Salary> pages = salaryService.page(Condition.getPage(query), Condition.getQueryWrapper(salary));
+		if (CollectionUtils.isNotEmpty(pages.getRecords())){
+			pages.getRecords().stream().forEach(item ->{
+				R<User> user = userClient.userInfoById(item.getCreateUser());
+				if (user.isSuccess() && user.getData() != null){
+					item.setCreateUserName(user.getData().getName());
+				}
+				if (item.getUpdateUser() != null){
+					R<User> info = userClient.userInfoById(item.getUpdateUser());
+					if (info.isSuccess() && info.getData() != null){
+						item.setUpdateUserName(info.getData().getName());
+					}
+				}
+			});
+		}
 		return R.data(pages);
 	}