Merge branch 'dev'

ruoyi-modules/ruoyi-mall/src/main/java/org/dromara/mall/controller/product/app/property/vo/value/AppProductPropertyValueDetailRespVO.java

@@ -13,6 +13,9 @@ public class AppProductPropertyValueDetailRespVO {
     @Schema(description = "属性的名称", requiredMode = Schema.RequiredMode.REQUIRED, example = "颜色")
     private String propertyName;
 
+    @Schema(description = "属性类型", example = "TEXT")
+    private String propertyType;
+
     @Schema(description = "属性值的编号", requiredMode = Schema.RequiredMode.REQUIRED, example = "1024")
     private Long valueId;
 

ruoyi-modules/ruoyi-system/src/main/java/org/dromara/system/controller/system/SysUserController.java

@@ -7,7 +7,9 @@ import cn.hutool.core.util.ArrayUtil;
 import cn.hutool.core.util.ObjectUtil;
 import jakarta.servlet.http.HttpServletResponse;
 import jakarta.validation.constraints.NotNull;
+import lombok.Data;
 import lombok.RequiredArgsConstructor;
+import lombok.experimental.Accessors;
 import org.dromara.common.core.constant.UserConstants;
 import org.dromara.common.core.domain.R;
 import org.dromara.common.core.enums.UserType;
@@ -100,9 +102,84 @@ public class SysUserController extends BaseController {
      */
     @PostMapping("/importTemplate")
     public void importTemplate(HttpServletResponse response) {
+//        List<DropDownOptions> options = getDropDownOptions();
         ExcelUtil.exportExcel(new ArrayList<>(), "用户数据", SysUserImportVo.class, response);
     }
 
+//    @org.jetbrains.annotations.NotNull
+//    private List<DropDownOptions> getDropDownOptions() {
+//        SysDeptBo sysDeptBo = new SysDeptBo();
+//        sysDeptBo.setStatus(UserConstants.DEPT_NORMAL);
+//        //获取部门列表
+//        List<SysDeptVo> deptList = deptService.selectDeptList(sysDeptBo);
+//        deptList.forEach(d -> {
+//            //设置名称
+//            Long parentId = d.getParentId();
+//            List<String> nameList = new ArrayList<>();
+//            nameList.add(d.getDeptName());
+//            while (parentId != 0L) {
+//                Long finalParentId = parentId;
+//                SysDeptVo sdv = StreamUtils.findFirst(deptList, dept -> Objects.equals(dept.getDeptId(), finalParentId));
+//                if (sdv != null) {
+//                    nameList.add(sdv.getDeptName());
+//                    parentId = sdv.getParentId();
+//                } else {
+//                    parentId = 0L;
+//                }
+//            }
+//            Collections.reverse(nameList);
+//            String name = StrUtil.join("-", nameList);
+//            d.setDeptName(name);
+//        });
+//        List<DemoDept> deptDataList = StreamUtils.toList(deptList, dept -> new DemoDept().setId(dept.getDeptId()).setName(dept.getDeptName()).setDeptId(dept.getDeptId()));
+//        //获取角色列表
+//        List<SysRoleVo> roleList = getInfo(null).getData().getRoles();
+//        //获取职位列表
+//        SysPostBo post = new SysPostBo();
+//        post.setStatus(UserConstants.POST_NORMAL);
+//        post.setParams(MapUtil.<String, Object>builder().put("deptIds", StreamUtils.toList(deptList, SysDeptVo::getDeptId)).build());
+//        List<SysPostVo> postList = postService.selectPostList(post);
+//        List<DemoDept> postDataList = StreamUtils.toList(postList, p -> new DemoDept().setId(p.getPostId()).setName(p.getPostName()).setDeptId(p.getDeptId()));
+//
+//        int deptIndex = 2, roleIndex = 9, postIndex = 8;
+//        DropDownOptions deptToPost = DropDownOptions.buildLinkedOptions(
+//            deptDataList,
+//            deptIndex,
+//            postDataList,
+//            postIndex,
+//            DemoDept::getDeptId,
+//            DemoDept::getDeptId,
+//            everyOptions -> DropDownOptions.createOptionValue(
+//                everyOptions.getName()
+//            )
+//        );
+//        DropDownOptions role = new DropDownOptions(roleIndex, StreamUtils.toList(roleList, SysRoleVo::getRoleName));
+//
+//        // 把所有的下拉框存储
+//        List<DropDownOptions> options = new ArrayList<>();
+//        options.add(deptToPost);
+//        options.add(role);
+//        return options;
+//    }
+
+    @Data
+    @Accessors(chain = true)
+    static class DemoDept {
+        /**
+         * id
+         */
+        private Long id;
+        /**
+         * name
+         */
+        private String name;
+        /**
+         * 部门id
+         */
+        private Long deptId;
+    }
+
+
     /**
      * 获取用户信息
      *

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

@@ -111,12 +111,6 @@ public class SysUserImportVo implements Serializable {
     @ExcelProperty("微信号")
     private String wechatId;
 
-    /**
-     * 微信二维码
-     */
-    @ExcelProperty("微信二维码")
-    private Long wechatQrCode;
-
     /**
      * 备注
      */

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

@@ -26,10 +26,7 @@ import org.dromara.system.mapper.SysUserPostMapper;
 import org.dromara.system.service.ISysPostService;
 import org.springframework.stereotype.Service;
 
-import java.util.Arrays;
-import java.util.List;
-import java.util.Objects;
-import java.util.Optional;
+import java.util.*;
 import java.util.stream.Collectors;
 
 /**
@@ -91,6 +88,9 @@ public class SysPostServiceImpl implements ISysPostService {
                 x.in(SysPost::getDeptId, deptIds);
             });
         }
+//        Map<String, Object> params = bo.getParams();
+//        List<Long> deptIds = (List<Long>) params.getOrDefault("deptIds", List.of());
+//        wrapper.in(CollectionUtils.isNotEmpty(deptIds), SysDept::getDeptId, deptIds);
         return wrapper;
     }