陆运修改

Signed-off-by: sunhz <mpcoo@foxmail.com>

blade-service-api/blade-land-api/src/main/java/org/springblade/land/vo/OrderAcctVO.java

@@ -34,6 +34,14 @@ public class OrderAcctVO {
 
 	private List<Long> salesmanDeptList;
 
+	private Long dispatcher;
+
+	private String dispatcherName;
+
+	private Long dispatchDept;
+
+	private String dispatchDeptName;
+
 	private String addressDetail;
 
 	private String receiptNo;

blade-service-api/blade-project-api/src/main/java/org/springblade/project/entity/Handover.java

@@ -91,6 +91,11 @@ public class Handover implements Serializable {
 	@ApiModelProperty(value = "接手人姓名")
 	private String handingUserName;
 	/**
+	 * 接手客户姓名
+	 */
+	@ApiModelProperty(value = "接手客户姓名")
+	private String handingCorpName;
+	/**
 	 * 联系人
 	 */
 	@ApiModelProperty(value = "联系人")

blade-service/blade-land/src/main/java/org/springblade/land/mapper/OrderMapper.xml

@@ -31,12 +31,14 @@
                t3.cname as corpName,
                t3.short_name as corpShortName,
                t1.salesman,
+               t5.name as salesmanName,
                t1.salesman_dept as salesmanDept,
                t1.create_user as createUser,
                t1.dispatcher,
+               t7.name as dispatcherName,
                t1.dispatch_dept as dispatchDept,
+               t6.dept_name as dispatchDeptName,
                t2.arrival_time as arrivalTime,
-               t5.name as salesmanName,
                t1.address_detail as addressDetail,
                t1.receipt_no as receiptNo,
                t1.bill_no as billNo,
@@ -55,6 +57,8 @@
                  left join basic_corps_desc t3 on t1.corp_id = t3.id
                  left join basic_corps_desc t4 on t2.fleet_id = t4.id
                  left join blade_user t5 on t1.salesman = t5.id
+                 left join blade_dept t6 on t1.dispatch_dept = t6.id
+                 left join blade_user t7 on t1.dispatcher = t7.id
         <where>
             t1.tenant_id = #{acct.tenantId}
             and t2.kind = '2'

blade-service/blade-system/src/main/java/org/springblade/system/controller/DeptController.java

@@ -16,6 +16,7 @@
  */
 package org.springblade.system.controller;
 
+import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.core.conditions.query.QueryWrapper;
 import com.baomidou.mybatisplus.core.toolkit.Wrappers;
 import com.github.xiaoymin.knife4j.annotations.ApiOperationSupport;
@@ -27,6 +28,7 @@ import org.springblade.core.mp.support.Condition;
 import org.springblade.core.secure.BladeUser;
 import org.springblade.core.secure.annotation.PreAuth;
 import org.springblade.core.secure.constant.AuthConstant;
+import org.springblade.core.secure.utils.AuthUtil;
 import org.springblade.core.tenant.annotation.NonDS;
 import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
@@ -106,6 +108,20 @@ public class DeptController extends BladeController {
 	}
 
 	/**
+	 * 顶级部门列表
+	 */
+	@GetMapping("/top-list")
+	@PreAuth(AuthConstant.PERMIT_ALL)
+	public R<List<DeptVO>> topList() {
+		List<Dept> list = deptService.list(new LambdaQueryWrapper<Dept>()
+			.eq(Dept::getParentId, 0)
+			.eq(Dept::getTenantId, AuthUtil.getTenantId())
+			.eq(Dept::getIsDeleted, 0)
+		);
+		return R.data(DeptWrapper.build().listNodeVO(list));
+	}
+
+	/**
 	 * 获取部门树形结构
 	 *
 	 * @return

blade-service/blade-user/src/main/java/org/springblade/system/user/controller/UserController.java

@@ -38,6 +38,7 @@ import org.springblade.core.tool.api.R;
 import org.springblade.core.tool.constant.BladeConstant;
 import org.springblade.core.tool.constant.RoleConstant;
 import org.springblade.core.tool.utils.DateUtil;
+import org.springblade.core.tool.utils.ObjectUtil;
 import org.springblade.core.tool.utils.StringPool;
 import org.springblade.core.tool.utils.StringUtil;
 import org.springblade.system.entity.Tenant;
@@ -107,6 +108,7 @@ public class UserController {
 	public R userList(UserVO userVO) {
 		LambdaQueryWrapper<User> lambdaQueryWrapper = new LambdaQueryWrapper<>();
 		lambdaQueryWrapper.like(StringUtils.isNotBlank(userVO.getRealName()), User::getRealName, userVO.getRealName())
+			.eq(ObjectUtil.isNotEmpty(userVO.getDeptPid()), User::getDeptPid, userVO.getDeptPid())
 			.eq(User::getTenantId, AuthUtil.getTenantId())
 			.eq(User::getIsDeleted, 0);
 		return R.data(userService.list(lambdaQueryWrapper));