Merge branch 'fu-dev' of uskycloud/usky-cloud into system-165

base-common/ruoyi-common-core/src/main/java/com/ruoyi/common/core/utils/poi/ExcelUtil.java

@@ -528,6 +528,7 @@ public class ExcelUtil<T>
         dataFont.setFontName("Arial");
         dataFont.setFontHeightInPoints((short) 10);
         style.setFont(dataFont);
+        style.setWrapText(true);//设置自动换行
         styles.put("data", style);
 
         style = wb.createCellStyle();
@@ -556,16 +557,19 @@ public class ExcelUtil<T>
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.LEFT);
+        style.setWrapText(true);//设置自动换行
         styles.put("data1", style);
 
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.CENTER);
+        style.setWrapText(true);//设置自动换行
         styles.put("data2", style);
 
         style = wb.createCellStyle();
         style.cloneStyleFrom(styles.get("data"));
         style.setAlignment(HorizontalAlignment.RIGHT);
+        style.setWrapText(true);//设置自动换行
         styles.put("data3", style);
 
         return styles;

base-modules/service-system/service-system-biz/src/main/java/com/usky/system/service/impl/SysDeptServiceImpl.java

@@ -22,6 +22,8 @@ import com.usky.system.service.vo.TreeNode;
 import com.usky.system.service.vo.TreeSelect;
 import com.usky.system.service.vo.UserPostVo;
 import org.omg.CORBA.StringHolder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 
@@ -37,6 +39,9 @@ import java.util.stream.Collectors;
  */
 @Service
 public class SysDeptServiceImpl extends AbstractCrudService<SysDeptMapper, SysDept> implements ISysDeptService {
+
+    private static final Logger log = LoggerFactory.getLogger(SysDeptServiceImpl.class);//还原代码
+
     @Autowired
     private SysDeptMapper deptMapper;