Merge remote-tracking branch 'origin/dev2' into dev2

PCS/src/main/java/cn/cslg/permission/common/model/vo/DepartmentInfoVO.java

@@ -0,0 +1,44 @@
+package cn.cslg.permission.common.model.vo;
+
+import com.baomidou.mybatisplus.annotation.TableField;
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/12/11
+ */
+@Data
+public class DepartmentInfoVO {
+
+    private Integer id;
+    /**
+     * 部门名称
+     */
+    private String name;
+
+    /**
+     * 部门描述
+     */
+    private String remark;
+
+    /**
+     * 租户ID
+     */
+    private Integer tenant;
+
+    /**
+     * 租户名称
+     */
+    private String tenantName;
+
+    /**
+     * 部门树路径
+     */
+    private String path;
+
+    private List<Integer> role;
+
+    private List<RoleVO> roleList;
+}

PCS/src/main/java/cn/cslg/permission/common/model/vo/PositionInfoVO.java

@@ -0,0 +1,31 @@
+package cn.cslg.permission.common.model.vo;
+
+import lombok.Data;
+
+import java.util.List;
+
+/**
+ * @Author xiexiang
+ * @Date 2024/12/12
+ */
+@Data
+public class PositionInfoVO {
+
+    private Integer id;
+
+    private String position;
+
+    private Integer tenant;
+
+    private String tenantName;
+
+    private Integer updepartment;
+
+    private String describe;
+
+    private Integer ismore;
+
+    private List<Integer> role;
+
+    private List<RoleVO> roleList;
+}

PCS/src/main/java/cn/cslg/permission/controller/DepartmentController.java

@@ -64,4 +64,9 @@ public class DepartmentController {
         return departmentService.getTenantDepartments();
     }
 
+    @GetMapping("/queryDepartmentInfo")
+    @Operation(summary = "查询部门信息")
+    public String queryDepartmentInfo(Integer id) {
+        return departmentService.queryDepartmentById(id);
+    }
 }

PCS/src/main/java/cn/cslg/permission/controller/PositionController.java

@@ -53,4 +53,10 @@ public class PositionController {
     public String getPositionList() {
         return positionService.getPositionList();
     }
+
+    @GetMapping("/queryPositionInfo")
+    @Operation(summary = "查询职位信息")
+    public String queryPositionInfo(Integer id) {
+        return positionService.queryPositionById(id);
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/DepartmentService.java

@@ -1,5 +1,6 @@
 package cn.cslg.permission.service;
 
+import cn.cslg.permission.common.model.vo.DepartmentInfoVO;
 import cn.cslg.permission.common.model.vo.DepartmentVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
 import cn.cslg.permission.common.utils.CacheUtils;
@@ -20,6 +21,7 @@ import cn.hutool.core.lang.tree.TreeUtil;
 import com.baomidou.mybatisplus.core.conditions.query.LambdaQueryWrapper;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
+import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -266,4 +268,15 @@ public class DepartmentService extends ServiceImpl<DepartmentMapper, Department>
         });
     }
 
+    public String queryDepartmentById(Integer id) {
+        DepartmentInfoVO departmentInfoVO = new DepartmentInfoVO();
+        Department data = this.getById(id);
+        BeanUtils.copyProperties(data, departmentInfoVO);
+        departmentInfoVO.setName(data.getDepartmentName());
+        departmentInfoVO.setTenant(data.getTenantId());
+        departmentInfoVO.setRemark(data.getDepartmentDescription());
+        departmentInfoVO.setRole(departRoleService.queryAssociateDepartRole(data.getId()));
+        departmentInfoVO.setRoleList(departRoleService.getRoleListByDepartmentId(data.getId()));
+        return Response.success(departmentInfoVO);
+    }
 }

PCS/src/main/java/cn/cslg/permission/service/PositionService.java

@@ -1,11 +1,14 @@
 package cn.cslg.permission.service;
 
+import cn.cslg.permission.common.model.vo.DepartmentInfoVO;
 import cn.cslg.permission.common.model.vo.PersonnelVO;
+import cn.cslg.permission.common.model.vo.PositionInfoVO;
 import cn.cslg.permission.common.model.vo.PositionVO;
 import cn.cslg.permission.common.utils.CacheUtils;
 import cn.cslg.permission.common.utils.DataUtils;
 import cn.cslg.permission.common.utils.Response;
 import cn.cslg.permission.common.utils.SecurityUtils.SecurityUtils;
+import cn.cslg.permission.domain.Department;
 import cn.cslg.permission.domain.Position;
 import cn.cslg.permission.domain.Tenant;
 import cn.cslg.permission.mapper.PositionMapper;
@@ -18,6 +21,7 @@ import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
 import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.springframework.beans.BeanUtils;
 import org.springframework.context.annotation.Lazy;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
@@ -112,6 +116,7 @@ public class PositionService extends ServiceImpl<PositionMapper, Position> {
             position
                     .setPositionName(positionVO.getPosition())
                     .setPositionDescription(positionVO.getDescribe())
+                    .setPositionIsOnly(positionVO.getIsmore())
                     .setId(positionVO.getId());
             position.updateById();
 
@@ -193,4 +198,24 @@ public class PositionService extends ServiceImpl<PositionMapper, Position> {
 
         return positionVOS;
     }
+
+    public String queryPositionById(Integer id) {
+        PositionInfoVO positionVO = new PositionInfoVO();
+        Position data = this.getById(id);
+        if (data != null) {
+            positionVO.setPosition(data.getPositionName());
+            positionVO.setIsmore(data.getPositionIsOnly());
+            positionVO.setId(data.getId());
+            positionVO.setDescribe(data.getPositionDescription());
+            positionVO.setRole(positionRoleService.getRoleIdsByPositionId(data.getId()));
+            positionVO.setRoleList(positionRoleService.getRoleListByPositionId(data.getId()));
+            positionVO.setTenant(data.getTenantId());
+            Tenant tenant = tenantService.getById(data.getTenantId());
+            if (tenant != null) {
+                positionVO.setTenantName(tenant.getTenantName());
+            }
+        }
+        return Response.success(positionVO);
+    }
+
 }