Merge remote-tracking branch 'origin/master'

gather-app/src/main/java/com/ruoyi/business/controller/BusinessTripApprovalController.java

@@ -72,15 +72,9 @@ public class BusinessTripApprovalController extends BaseController {
             throw new RuntimeException("请选择是否自带公务车辆");
         }
         if (dto.getHasOffcialCar() != null && dto.getHasOffcialCar() == 1) {
-            if (dto.getCarModel() == null) {
-                throw new RuntimeException("请选择使用车型");
-            }
             if (dto.getUseCarType() == null) {
                 throw new RuntimeException("请选择用车方式");
             }
-            if (dto.getSeats() == null) {
-                throw new RuntimeException("请输入座位数");
-            }
         }
         if (dto.getStartDate() == null || dto.getEndDate() == null) {
             throw new RuntimeException("请选择出差时间范围");
@@ -340,13 +334,21 @@ public class BusinessTripApprovalController extends BaseController {
             if (dto.getReason() == null) {
                 throw new RuntimeException("驳回意见不可为空");
             }
-            approvalProcess.setApprovalStatus(0);
+            if (approvalStatus == 100 || approvalStatus == 200 || approvalStatus == 300) {
+                approvalProcess.setApprovalStatus(400);
+                List<Long> userIds = new ArrayList<>();
+                userIds.add(1660L);
+                userIds.add(1661L);
+                addLog(approvalProcess, userIds);
+            }else {
+                approvalProcess.setApprovalStatus(0);
+                List<Long> userIds = new ArrayList<>();
+                userIds.add(approvalProcess.getSubmitterId());
+                addLog(approvalProcess, userIds);
+            }
             one.setCheckState(dto.getState());
             one.setCheckTime(System.currentTimeMillis() / 1000L);
             one.setReason(dto.getReason());
-            List<Long> userIds = new ArrayList<>();
-            userIds.add(approvalProcess.getSubmitterId());
-            addLog(approvalProcess, userIds);
             boolean updateById = gwglLogService.updateById(one);
             boolean updateById1 = approvalsProcessService.updateById(approvalProcess);
             return toAjax(updateById1 && updateById);

ruoyi-system/src/main/resources/mapper/system/SysUserMapper.xml

@@ -60,7 +60,7 @@
 	<sql id="selectUserVo">
 		select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.shoe_size,u.has_approval,u.is_leader,
 		       u.user_type_cn,u.id_card, u.dept_id, u.user_name, u.nick_name, u.email, u.avatar, u.phonenumber, u.password, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.create_by, u.create_time, u.remark, u.area_auth_code,
-			   d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader, d.status as dept_status,
+			   d.dept_id, d.parent_id, d.ancestors, d.dept_name, d.order_num, d.leader,d.leader_id, d.status as dept_status,
 			   r.role_id, r.role_name, r.role_key, r.role_sort, r.data_scope, r.status as role_status
 		from sys_user u
 				 left join sys_dept d on u.dept_id = d.dept_id
@@ -69,7 +69,7 @@
 	</sql>
 
 	<select id="selectUserList" parameterType="SysUser" resultMap="SysUserResult">
-		select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.has_approval,u.is_leader,u.shoe_size,u.user_type_cn,u.id_card, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.area_auth_code, u.create_by, u.create_time, u.remark, d.dept_name, d.leader from sys_user u
+		select u.user_id,u.user_num,u.hat_size,u.bottoms_size,u.tops_size,u.has_approval,u.is_leader,u.shoe_size,u.user_type_cn,u.id_card, u.dept_id, u.nick_name, u.user_name, u.email, u.avatar, u.phonenumber, u.sex, u.status, u.del_flag, u.login_ip, u.login_date, u.area_auth_code, u.create_by, u.create_time, u.remark, d.dept_name, d.leader,d.leader_id from sys_user u
 		left join sys_dept d on u.dept_id = d.dept_id
 		where u.del_flag = '0'
 		<if test="userId != null and userId != 0">