代码优化

.run/ruoyi-auth.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-auth" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-auth:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-auth/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-gateway.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-gateway" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-gateway:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-gateway/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-gen.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-gen" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-gen:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-gen/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-job.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-job" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-job:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-job/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-monitor.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-monitor" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-monitor:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-monitor/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-nacos.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-nacos" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-nacos:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-nacos/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-resource.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-resource" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-resource:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-resource/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-seata-server.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-seata-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-seata-server:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-seata-server/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-sentinel-dashboard.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-sentinel-dashboard" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-sentinel-dashboard:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-sentinel-dashboard/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-snailjob-server.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-snailjob-server" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-snailjob-server:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-visual/ruoyi-snailjob-server/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-system.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-system" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-system:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-system/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

.run/ruoyi-workflow.run.xml

-<component name="ProjectRunConfigurationManager">
-  <configuration default="false" name="ruoyi-workflow" type="docker-deploy" factoryName="dockerfile" server-name="Docker">
-    <deployment type="dockerfile">
-      <settings>
-        <option name="imageTag" value="ruoyi/ruoyi-workflow:2.2.2" />
-        <option name="buildOnly" value="true" />
-        <option name="sourceFilePath" value="ruoyi-modules/ruoyi-workflow/Dockerfile" />
-      </settings>
-    </deployment>
-    <method v="2" />
-  </configuration>
-</component>

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDept.java

 package org.dromara.system.domain;
 
-import com.baomidou.mybatisplus.annotation.TableId;
-import com.baomidou.mybatisplus.annotation.TableLogic;
-import com.baomidou.mybatisplus.annotation.TableName;
+import com.baomidou.mybatisplus.annotation.*;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import org.dromara.common.tenant.core.TenantEntity;
@@ -53,6 +51,7 @@ public class SysDept extends TenantEntity {
     /**
      * 负责人
      */
+    @TableField(updateStrategy = FieldStrategy.ALWAYS)
     private Long leader;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDeptOss.java

@@ -52,6 +52,11 @@ public class SysDeptOss extends TenantEntity {
      */
     private String file;
 
+    /**
+     * 文件大小
+     */
+    private String fileSize;
+
     /**
      * 是否公开
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/SysDeptTravelLine.java

 package org.dromara.system.domain;
 
-import org.dromara.common.tenant.core.TenantEntity;
-import com.baomidou.mybatisplus.annotation.*;
+import com.baomidou.mybatisplus.annotation.TableField;
+import com.baomidou.mybatisplus.annotation.TableId;
+import com.baomidou.mybatisplus.annotation.TableName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import org.dromara.common.translation.annotation.Translation;
-import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.tenant.core.TenantEntity;
 
 import java.io.Serial;
 
@@ -42,6 +42,7 @@ public class SysDeptTravelLine extends TenantEntity {
     /**
      * 部门简介
      */
+    @TableField(value = "`desc`")
     private String desc;
 
     /**

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptOssBo.java

@@ -56,6 +56,11 @@ public class SysDeptOssBo extends BaseEntity {
     @NotBlank(message = "文件不能为空", groups = { AddGroup.class, EditGroup.class })
     private String file;
 
+    /**
+     * 文件大小
+     */
+    private String fileSize;
+
     /**
      * 是否公开
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/bo/SysDeptTravelLineBo.java

 package org.dromara.system.domain.bo;
 
-import org.dromara.system.domain.SysDeptTravelLine;
-import org.dromara.common.mybatis.core.domain.BaseEntity;
-import org.dromara.common.core.validate.AddGroup;
-import org.dromara.common.core.validate.EditGroup;
 import io.github.linpeilie.annotations.AutoMapper;
+import jakarta.validation.constraints.NotBlank;
+import jakarta.validation.constraints.NotNull;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
-import jakarta.validation.constraints.*;
-import org.dromara.common.translation.annotation.Translation;
-import org.dromara.common.translation.constant.TransConstant;
+import org.dromara.common.core.validate.AddGroup;
+import org.dromara.common.core.validate.EditGroup;
+import org.dromara.common.mybatis.core.domain.BaseEntity;
+import org.dromara.system.domain.SysDeptTravelLine;
 
 /**
  * 部门主推线路业务对象 sys_dept_travel_line
@@ -55,7 +54,7 @@ public class SysDeptTravelLineBo extends BaseEntity {
     /**
      * 服务商
      */
-    @NotBlank(message = "服务商不能为空", groups = { AddGroup.class, EditGroup.class })
+//    @NotBlank(message = "服务商不能为空", groups = { AddGroup.class, EditGroup.class })
     private String service;
 
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/domain/vo/SysDeptOssVo.java

@@ -69,6 +69,13 @@ public class SysDeptOssVo implements Serializable {
     @Translation(type = TransConstant.OSS_ID_TO_URL, mapper = "file")
     private String fileUrl;
 
+
+    /**
+     * 文件大小
+     */
+    @ExcelProperty(value = "文件大小")
+    private String fileSize;
+
     /**
      * 是否公开
      */

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/service/impl/SysDeptServiceImpl.java

@@ -357,10 +357,19 @@ public class SysDeptServiceImpl implements ISysDeptService {
         //查询部门员工
         List<SysUser> userList = userMapper.selectList(SysUser::getDeptId, dept.getDeptId());
         List<SysUserPost> supList = CollectionUtils.isEmpty(userList) ? List.of() : userPostMapper.selectList(SysUserPost::getUserId, StreamUtils.toList(userList, SysUser::getUserId));
-        List<SysPost> postList = postMapper.selectByIds(StreamUtils.toSet(supList, SysUserPost::getPostId));
+        List<SysPost> postList = CollectionUtils.isEmpty(supList) ? List.of() : postMapper.selectByIds(StreamUtils.toSet(supList, SysUserPost::getPostId));
 
         //构建数据
         SysDeptDetailVo detail = BeanUtil.copyProperties(dept, SysDeptDetailVo.class);
+        if (ObjectUtil.isNotNull(detail.getLeader())) {
+            userList.stream().filter(u -> Objects.equals(u.getUserId(), detail.getLeader()))
+                .findFirst().ifPresent(u -> {
+                    detail.setWechatId(u.getWechatId());
+                    detail.setWechatQrCode(u.getWechatQrCode());
+                    detail.setAvatar(u.getAvatar());
+                });
+        }
+
         List<SysDeptDetailVo.User> users = userList.stream().map(user -> {
             SysDeptDetailVo.User u = BeanUtil.copyProperties(user, SysDeptDetailVo.User.class);
             u.setPostIds(supList.stream().filter(sup -> Objects.equals(sup.getUserId(), user.getUserId())).map(SysUserPost::getPostId).collect(Collectors.toList()));