Merge remote-tracking branch 'origin/master'

user_center/src/main/java/com/huaxu/controller/DictController.java

@@ -2,6 +2,7 @@ package com.huaxu.controller;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.baomidou.mybatisplus.extension.plugins.pagination.Page;
+import com.huaxu.dto.DictDto;
 import com.huaxu.entity.Dict;
 import com.huaxu.model.AjaxMessage;
 import com.huaxu.model.LoginUser;
@@ -139,5 +140,21 @@ public class DictController {
 
         return new AjaxMessage<>(ResultStatus.OK, result);
     }
+    /**
+     * 根据备注查询字典列表
+     *
+     * @param remark 备注
+     * @return 数据列表
+     */
+    @RequestMapping(value = "selectParentList", method = RequestMethod.POST)
+    @ApiOperation(value = "根据备注查询字典列表")
+    public AjaxMessage<List<DictDto>> selectParentList(
+            @ApiParam(value = "备注", required = true)@RequestParam String remark) {
+        Dict dict=new Dict();
+        dict.setRemark(remark);
+        List<DictDto> result = dictService.selectParentList(dict);
+
+        return new AjaxMessage<>(ResultStatus.OK, result);
+    }
 
 }

user_center/src/main/java/com/huaxu/controller/UserController.java

@@ -264,4 +264,12 @@ public class UserController {
         List<Integer> result = userService.getUserIdsByOrgId(list);
         return result;
     }
+
+    @RequestMapping(value = "/findUserIdsByOrgId", method = RequestMethod.POST)
+    @ResponseBody
+    public AjaxMessage<List<UserEntity>> findUserIdsByOrgId(String ids) {
+        List list = JSONObject.parseObject(ids, List.class);
+        List<UserEntity> result = userService.findUserIdsByOrgId(list);
+        return new AjaxMessage<>(ResultStatus.OK,result);
+    }
 }

user_center/src/main/java/com/huaxu/dao/DictMapper.java

@@ -1,6 +1,7 @@
 package com.huaxu.dao;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dto.DictDto;
 import com.huaxu.entity.Dict;
 import org.apache.ibatis.annotations.Mapper;
 import org.apache.ibatis.annotations.Param;
@@ -87,5 +88,12 @@ public interface DictMapper {
      * @return 数据总数
      */
     int countByCodePid(Dict dict);
+    /**
+     * 查询父列表
+     *
+     * @param dict 实例对象
+     * @return 对象列表
+     */
+    List<DictDto> selectParentList(Dict dict);
 
 }

user_center/src/main/java/com/huaxu/dao/UserMapper.java

@@ -32,5 +32,7 @@ public interface UserMapper extends BaseMapper<UserEntity> {
 
     List<Integer> getUserIdsByOrgId(List<Integer> orgIds);
 
+    List<UserEntity> findUserIdsByOrgId(List<Integer> orgIds);
+
     /**删除相关方法  使用mybatis-plus集成的 **/
 }

user_center/src/main/java/com/huaxu/dto/DictDto.java

@@ -0,0 +1,46 @@
+package com.huaxu.dto;
+
+import com.huaxu.entity.Dict;
+import io.swagger.annotations.ApiModel;
+import io.swagger.annotations.ApiModelProperty;
+import lombok.Data;
+
+import java.io.Serializable;
+import java.util.List;
+
+/**
+ * 数据字典扩展类
+ *
+ * @author yjy
+ * @since 2021-1-11
+ */
+@Data
+@ApiModel
+public class DictDto implements Serializable {
+    private static final long serialVersionUID = 269554608076349144L;
+    /**
+     * 父编码主键
+     */
+    @ApiModelProperty(value = "父编码主键")
+    private Integer parentDictId;
+    /**
+     * 父编码名称
+     */
+    @ApiModelProperty(value = "父编码名称")
+    private String parentDictName;
+    /**
+     * 父编码
+     */
+    @ApiModelProperty(value = "父编码")
+    private String parentDictCode;
+    /**
+     * 备注
+     */
+    @ApiModelProperty(value = "备注")
+    private String remark;
+    /**
+     * 字典列表
+     */
+    @ApiModelProperty(value = "字典列表")
+    private List<Dict> dictList;
+}

user_center/src/main/java/com/huaxu/service/DictService.java

@@ -1,6 +1,7 @@
 package com.huaxu.service;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
+import com.huaxu.dto.DictDto;
 import com.huaxu.entity.Dict;
 
 import java.util.List;
@@ -83,4 +84,12 @@ public interface DictService {
      * @return 数据总数
      */
     int countByCodePid(Dict dict);
+
+    /**
+     * 查询父列表
+     *
+     * @param dict 实例对象
+     * @return 对象列表
+     */
+    List<DictDto> selectParentList(Dict dict);
 }

user_center/src/main/java/com/huaxu/service/UserService.java

@@ -260,4 +260,12 @@ public class UserService extends ServiceImpl<UserMapper,UserEntity> {
 
 		return userIds;
     }
+	public List<UserEntity> findUserIdsByOrgId(List<Integer> orgIds)
+	{
+		List<UserEntity> userEntities = new ArrayList<>();
+		if(orgIds.size()>0){
+			userEntities=userMapper.findUserIdsByOrgId(orgIds);
+		}
+		return userEntities;
+	}
 }

user_center/src/main/java/com/huaxu/service/impl/DictServiceImpl.java

@@ -2,6 +2,7 @@ package com.huaxu.service.impl;
 
 import com.baomidou.mybatisplus.core.metadata.IPage;
 import com.huaxu.dao.DictMapper;
+import com.huaxu.dto.DictDto;
 import com.huaxu.entity.Dict;
 import com.huaxu.service.DictService;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -126,4 +127,14 @@ public class DictServiceImpl implements DictService {
     public int countByCodePid(Dict dict) {
         return this.dictMapper.countByCodePid(dict);
     }
+
+    /**
+     * 查询父列表
+     *
+     * @return 实例对象的集合
+     */
+    @Override
+    public List<DictDto> selectParentList(Dict dict) {
+        return this.dictMapper.selectParentList(dict);
+    }
 }

user_center/src/main/resources/mapper/DictMapper.xml

@@ -15,6 +15,18 @@
         <result property="updateBy" column="UPDATE_BY" jdbcType="VARCHAR"/>
         <result property="dateUpdate" column="DATE_UPDATE" jdbcType="TIMESTAMP"/>
     </resultMap>
+    <!-- 二层结果集 -->
+    <resultMap type="com.huaxu.dto.DictDto" id="DictDtoMap">
+        <result property="parentDictId" column="PARENT_DICT_ID" jdbcType="INTEGER"/>
+        <result property="parentDictName" column="DICT_NAME" jdbcType="VARCHAR"/>
+        <result property="parentDictCode" column="PARENT_DICT_CODE" jdbcType="VARCHAR"/>
+        <result property="remark" column="REMARK" jdbcType="VARCHAR"/>
+        <collection property="dictList" ofType="java.util.Map" javaType="list">
+            <result property="id" column="ID" jdbcType="INTEGER"/>
+            <result property="dictCode" column="DICT_CODE" jdbcType="VARCHAR"/>
+            <result property="dictValue" column="DICT_VALUE" jdbcType="VARCHAR"/>
+        </collection>
+    </resultMap>
 
     <!-- 基本字段 -->
     <sql id="Base_Column_List">
@@ -194,4 +206,15 @@
             and STATUS =1
         </where>
     </select>
+    <!--查询父列表-->
+    <select id="selectParentList" resultMap="DictDtoMap">
+        select t2.parent_dict_id,t1.dict_code parent_dict_code,t1.dict_name,t1.remark,t2.id,t2.dict_code,t2.dict_value
+        from uims_dict t1
+        inner join uims_dict t2 on t1.id=t2.parent_dict_id
+        where t1.`status`=1 and t2.`status`=1
+        <if test="remark != null and remark != ''">
+            and t1.remark = #{remark}
+        </if>
+        order by t1.date_create,t2.date_create
+    </select>
 </mapper>

user_center/src/main/resources/mapper/UserMapper.xml

@@ -128,7 +128,7 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         order by a.date_create desc
 	 </select>
     <select id="getUserIdsByOrgId" resultType="int">
-        select id from uims_user a where status=1 and (
+        select distinct id from uims_user a where status=1 and (
         a.DEPT_ORG_ID in
         <foreach collection="list" item="item" open="(" close=")" separator=",">
             #{item}
@@ -140,4 +140,21 @@ PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN"
         </foreach>
             )
     </select>
+    <select id="findUserIdsByOrgId"  resultType="com.huaxu.entity.UserEntity">
+        SELECT
+        <include refid="userColumns"/>
+        FROM uims_user a
+        <include refid="sysAreaJoins"/>
+        where a.status=1 and (
+        a.DEPT_ORG_ID in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        or
+        a.COMPANY_ORG_ID in
+        <foreach collection="list" item="item" open="(" close=")" separator=",">
+            #{item}
+        </foreach>
+        )
+    </select>
 </mapper>