问题修改 11.10

jeecg-boot/jeecg-boot-base-core/src/main/java/org/jeecg/config/shiro/ShiroConfig.java

@@ -185,7 +185,10 @@ public class ShiroConfig {
 
         filterChainDefinitionMap.put("/sys/user/userRegister4Faren", "anon"); //法人注册接口
         filterChainDefinitionMap.put("/sys/user/userRegister4Shenbaoren", "anon");//申报人注册
-        filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync", "anon");//申报人用户注册
+
+        filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync", "anon");//申报人注册时，选择部门列表
+
+        filterChainDefinitionMap.put("/sys/sysDepart/queryDepartTreeSync4FaRen", "anon");//法人注册时，选择部门列表
 
 
 

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/controller/SysDepartController.java

@@ -44,6 +44,7 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 import java.io.IOException;
 import java.util.*;
+import java.util.stream.Collectors;
 
 /**
  * <p>
@@ -170,6 +171,33 @@ public class SysDepartController {
         return result;
     }
 
+    /**
+     * @description: 法人注册时，只显示市和县区科技局，不显示下属单位
+     * @param: [parentId, ids, primaryKey]
+     * @return: org.jeecg.common.api.vo.Result<java.util.List<org.jeecg.modules.system.model.SysDepartTreeModel>>
+     * @author: z.h.c
+     * @date: 24/11/9 16:07
+     */
+    @RequestMapping(value = "/queryDepartTreeSync4FaRen", method = RequestMethod.GET)
+    public Result<List<SysDepartTreeModel>> queryDepartTreeSync4FaRen(@RequestParam(name = "pid", required = false) String parentId,
+                                                                      @RequestParam(name = "ids", required = false) String ids,
+                                                                      @RequestParam(name = "primaryKey", required = false) String primaryKey) {
+        Result<List<SysDepartTreeModel>> result = new Result<>();
+        try {
+//            parentId = "1839495887972130817";
+            List<SysDepart> sysDeparts = sysDepartService.list(new LambdaQueryWrapper<SysDepart>().eq(SysDepart::getParentId, "1839495887972130817"));
+            ids = Optional.ofNullable(sysDeparts).orElse(new LinkedList<>()).stream().map(e -> e.getId()).collect(Collectors.joining(","));
+            List<SysDepartTreeModel> list = sysDepartService.queryTreeListByPid4FaRen(parentId, ids, primaryKey);
+            result.setResult(list);
+            result.setSuccess(true);
+        } catch (Exception e) {
+            log.error(e.getMessage(), e);
+            result.setSuccess(false);
+            result.setMessage("查询失败");
+        }
+        return result;
+    }
+
     /**
      * 获取某个部门的所有父级部门的ID
      *

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/ISysDepartService.java

@@ -148,6 +148,7 @@ public interface ISysDepartService extends IService<SysDepart>{
      * @return
      */
     List<SysDepartTreeModel> queryTreeListByPid(String parentId,String ids, String primaryKey);
+    List<SysDepartTreeModel> queryTreeListByPid4FaRen(String parentId,String ids, String primaryKey);
 
     /**
      * 获取某个部门的所有父级部门的ID

jeecg-boot/jeecg-module-system/jeecg-system-biz/src/main/java/org/jeecg/modules/system/service/impl/SysDepartServiceImpl.java

@@ -645,6 +645,53 @@ public class SysDepartServiceImpl extends ServiceImpl<SysDepartMapper, SysDepart
 		return records;
 	}
 
+	public List<SysDepartTreeModel> queryTreeListByPid4FaRen(String parentId,String ids, String primaryKey) {
+		/*Consumer<LambdaQueryWrapper<SysDepart>> square = i -> {
+			if (oConvertUtils.isNotEmpty(ids)) {
+				if (CommonConstant.DEPART_KEY_ORG_CODE.equals(primaryKey)) {
+					i.in(SysDepart::getOrgCode, ids.split(SymbolConstant.COMMA));
+				} else {
+					i.in(SysDepart::getId, ids.split(SymbolConstant.COMMA));
+				}
+			} else {
+				if(oConvertUtils.isEmpty(parentId)){
+					i.and(q->q.isNull(true,SysDepart::getParentId).or().eq(true,SysDepart::getParentId,""));
+				}else{
+					i.eq(true,SysDepart::getParentId,parentId);
+				}
+			}
+		};*/
+		LambdaQueryWrapper<SysDepart> lqw=new LambdaQueryWrapper<>();
+
+		lqw.in(SysDepart::getId,ids.split(SymbolConstant.COMMA));
+//		i.in(SysDepart::getOrgCode, ids.split(SymbolConstant.COMMA));
+		//------------------------------------------------------------------------------------------------
+		//是否开启系统管理模块的 SASS 控制
+		/*if(MybatisPlusSaasConfig.OPEN_SYSTEM_TENANT_CONTROL){
+			lqw.eq(SysDepart::getTenantId, oConvertUtils.getInt(TenantContext.getTenant(), 0));
+		}*/
+		//------------------------------------------------------------------------------------------------
+		lqw.eq(true,SysDepart::getDelFlag,CommonConstant.DEL_FLAG_0.toString());
+//		lqw.func(square);
+        //update-begin---author:wangshuai ---date:20220527  for：[VUEN-1143]排序不对，vue3和2应该都有问题，应该按照升序排------------
+		lqw.orderByAsc(SysDepart::getDepartOrder);
+        //update-end---author:wangshuai ---date:20220527  for：[VUEN-1143]排序不对，vue3和2应该都有问题，应该按照升序排--------------
+		List<SysDepart> list = list(lqw);
+        //update-begin---author:wangshuai ---date:20220316  for：[JTC-119]在部门管理菜单下设置部门负责人 创建用户的时候不需要处理
+        //设置用户id,让前台显示
+//        this.setUserIdsByDepList(list);
+        //update-end---author:wangshuai ---date:20220316  for：[JTC-119]在部门管理菜单下设置部门负责人 创建用户的时候不需要处理
+		List<SysDepartTreeModel> records = new ArrayList<>();
+		for (int i = 0; i < list.size(); i++) {
+			SysDepart depart = list.get(i);
+            SysDepartTreeModel treeModel = new SysDepartTreeModel(depart);
+            //TODO 异步树加载key拼接__+时间戳,以便于每次展开节点会刷新数据
+			//treeModel.setKey(treeModel.getKey()+"__"+System.currentTimeMillis());
+            records.add(treeModel);
+        }
+		return records;
+	}
+
 	@Override
 	public JSONObject queryAllParentIdByDepartId(String departId) {
 		JSONObject result = new JSONObject();

jeecgboot-vue3/src/api/common/api.ts

@@ -8,6 +8,7 @@ enum Api {
   userList = '/sys/user/list',
   roleList = '/sys/role/list',
   queryDepartTreeSync = '/sys/sysDepart/queryDepartTreeSync',
+  queryDepartTreeSync4FaRen = '/sys/sysDepart/queryDepartTreeSync4FaRen',
   queryTreeList = '/sys/sysDepart/queryTreeList',
   loadTreeData = '/sys/category/loadTreeData',
   loadDictItem = '/sys/category/loadDictItem/',
@@ -51,6 +52,13 @@ export const getRoleList = (params) => {
 export const queryDepartTreeSync = (params?) => {
   return defHttp.get({ url: Api.queryDepartTreeSync, params });
 };
+
+// 法人注册时，弹出列表只显示市和县区科技局，不显示下属单位 add by zhc 11.10
+export const queryDepartTreeSync4FaRen = (params?) => {
+  return defHttp.get({ url: Api.queryDepartTreeSync4FaRen, params });
+};
+
+
 /**
  * 获取部门树列表
  */

jeecgboot-vue3/src/components/Form/src/jeecg/components/JSelectDept4FaRen.vue

@@ -0,0 +1,207 @@
+<!--部门选择组件-->
+<template>
+  <div class="JSelectDept">
+    <JSelectBiz  @change="handleSelectChange" @handleOpen="handleOpen" :loading="loadingEcho" v-bind="attrs"/>
+    <!-- update-begin--author:liaozhiyang---date:20240515---for：【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式 -->
+    <a-form-item>
+      <DeptSelectModal4FaRen @register="regModal" @getSelectResult="setValue" v-bind="getBindValue" :multiple="multiple" @close="handleClose"/>
+    </a-form-item>
+    <!-- update-end--author:liaozhiyang---date:20240515---for：【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式 -->
+  </div>
+</template>
+<script lang="ts">
+  import DeptSelectModal4FaRen from './modal/DeptSelectModal4FaRen.vue';
+  import JSelectBiz from './base/JSelectBiz.vue';
+  import { defineComponent, ref, reactive, watchEffect, watch, provide, unref, toRaw } from 'vue';
+  import { useModal } from '/@/components/Modal';
+  import { propTypes } from '/@/utils/propTypes';
+  import { useRuleFormItem } from '/@/hooks/component/useFormItem';
+  import { useAttrs } from '/@/hooks/core/useAttrs';
+  import { SelectValue } from 'ant-design-vue/es/select';
+  import { cloneDeep } from 'lodash-es';
+
+  export default defineComponent({
+    name: 'JSelectDept4FaRen',
+    components: {
+      DeptSelectModal4FaRen,
+      JSelectBiz,
+    },
+    inheritAttrs: false,
+    props: {
+      value: propTypes.oneOfType([propTypes.string, propTypes.array]),
+      // 是否允许多选，默认 true
+      multiple: propTypes.bool.def(true),
+    },
+    emits: ['options-change', 'change', 'select', 'update:value'],
+    setup(props, { emit, refs }) {
+      const emitData = ref<any[]>();
+      //注册model
+      const [regModal, { openModal }] = useModal();
+      //表单值
+      // const [state] = useRuleFormItem(props, 'value', 'change', emitData);
+      //下拉框选项值
+      const selectOptions = ref<SelectValue>([]);
+      //下拉框选中值
+      let selectValues = reactive<Recordable>({
+        value: [],
+      });
+      let tempSave: any = [];
+
+      // 是否正在加载回显数据
+      const loadingEcho = ref<boolean>(false);
+      //下发 selectOptions,xxxBiz组件接收
+      provide('selectOptions', selectOptions);
+      //下发 selectValues,xxxBiz组件接收
+      provide('selectValues', selectValues);
+      //下发 loadingEcho,xxxBiz组件接收
+      provide('loadingEcho', loadingEcho);
+
+      const tag = ref(false);
+      const attrs = useAttrs();
+
+      /**
+       * 监听组件值
+       */
+      watchEffect(() => {
+        // update-begin--author:liaozhiyang---date:20240611---for：【TV360X-576】已选中了数据，再次选择打开弹窗点击取消，数据清空了（同步JSelectDept改法）
+        //update-begin-author:liusq---date:2024-06-03--for: [TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
+        tempSave = [];
+        //update-end-author:liusq---date:2024-06-03--for:[TV360X-840]用户授权，没有选择，点取消，也会回显一个选过的用户
+        // update-end--author:liaozhiyang---date:20240611---for：【TV360X-576】已选中了数据，再次选择打开弹窗点击取消，数据清空了（同步JSelectDept改法）
+        props.value && initValue();
+      });
+
+      //update-begin-author:liusq---date:20220609--for: 为了解决弹窗form初始化赋值问题 ---
+      watch(
+        () => props.value,
+        () => {
+          initValue();
+        }
+      );
+      //update-end-author:liusq---date:20220609--for: 为了解决弹窗form初始化赋值问题 ---
+      /**
+       * 监听selectValues变化
+       */
+      // update-begin--author:liaozhiyang---date:20240527---for：【TV360X-414】部门设置了默认值，查询重置变成空了(同步JSelectUser组件改法)
+      // watch(selectValues, () => {
+      //   if (selectValues) {
+      //     state.value = selectValues.value;
+      //   }
+      // });
+      // update-end--author:liaozhiyang---date:20240527---for：【TV360X-414】部门设置了默认值，查询重置变成空了(同步JSelectUser组件改法)
+      /**
+       * 监听selectOptions变化
+       */
+      watch(selectOptions, () => {
+        if (selectOptions) {
+          emit('select', toRaw(unref(selectOptions)), toRaw(unref(selectValues)));
+        }
+      });
+
+      /**
+       * 打卡弹出框
+       */
+      function handleOpen() {
+        tag.value = true;
+        openModal(true, {
+          isUpdate: false,
+        });
+      }
+
+      /**
+       * 将字符串值转化为数组
+       */
+      function initValue() {
+        let value = props.value ? props.value : [];
+        if (value && typeof value === 'string') {
+          // state.value = value.split(',');
+          selectValues.value = value.split(',');
+          tempSave = value.split(',');
+        } else {
+          // 【VUEN-857】兼容数组（行编辑的用法问题）
+          selectValues.value = value;
+          tempSave = cloneDeep(value);
+        }
+      }
+
+      /**
+       * 设置下拉框的值
+       */
+      function setValue(options, values) {
+        selectOptions.value = options;
+        //emitData.value = values.join(",");
+        // state.value = values;
+        selectValues.value = values;
+        send(values);
+      }
+      const getBindValue = Object.assign({}, unref(props), unref(attrs));
+
+       // update-begin--author:liaozhiyang---date:20240527---for：【TV360X-414】部门设置了默认值，查询重置变成空了(同步JSelectUser组件改法)
+      const handleClose = () => {
+        if (tempSave.length) {
+          selectValues.value = cloneDeep(tempSave);
+        } else {
+          send(tempSave);
+        }
+      };
+      const handleSelectChange = (values) => {
+        tempSave = cloneDeep(values);
+        send(tempSave);
+      };
+      const send = (values) => {
+        let result = typeof props.value == 'string' ? values.join(',') : values;
+        emit('update:value', result);
+        emit('change', result);
+        // update-begin--author:liaozhiyang---date:20240627---for：【TV360X-1648】用户编辑界面“所属部门”与“负责部门”联动出错（同步之前丢的代码）
+        if (!values || values.length == 0) {
+          emit('select', null, null);
+        }
+        // update-end--author:liaozhiyang---date:20240627---for：【TV360X-1648】用户编辑界面“所属部门”与“负责部门”联动出错（同步之前丢的代码）
+      };
+      // update-end--author:liaozhiyang---date:20240527---for：【TV360X-414】部门设置了默认值，查询重置变成空了(同步JSelectUser组件改法)
+
+      return {
+        // state,
+        attrs,
+        selectOptions,
+        selectValues,
+        loadingEcho,
+        getBindValue,
+        tag,
+        regModal,
+        setValue,
+        handleOpen,
+        handleClose,
+        handleSelectChange,
+      };
+    },
+  });
+</script>
+<style lang="less" scoped>
+  // update-begin--author:liaozhiyang---date:20240515---for：【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式
+  .JSelectDept {
+    > .ant-form-item {
+      display: none;
+    }
+  }
+  // update-end--author:liaozhiyang---date:20240515---for：【QQYUN-9260】必填模式下会影响到弹窗内antd组件的样式
+  .j-select-row {
+    @width: 82px;
+
+    .left {
+      width: calc(100% - @width - 8px);
+    }
+
+    .right {
+      width: @width;
+    }
+
+    .full {
+      width: 100%;
+    }
+
+    :deep(.ant-select-search__field) {
+      display: none !important;
+    }
+  }
+</style>

jeecgboot-vue3/src/components/Form/src/jeecg/components/modal/DeptSelectModal4FaRen.vue

@@ -0,0 +1,131 @@
+<!--部门选择框-->
+<template>
+  <div>
+    <BasicModal v-bind="$attrs" @register="register" :title="modalTitle" width="500px" :maxHeight="maxHeight" @ok="handleOk" destroyOnClose @visible-change="visibleChange">
+      <BasicTree
+        ref="treeRef"
+        :treeData="treeData"
+        :load-data="sync == false ? null : onLoadData"
+        v-bind="getBindValue"
+        @select="onSelect"
+        @check="onCheck"
+        :fieldNames="fieldNames"
+        :checkedKeys="checkedKeys"
+        :multiple="multiple"
+        :checkStrictly="getCheckStrictly"
+      />
+      <!--树操作部分-->
+<!--      <template #insertFooter>
+        <a-dropdown placement="top">
+          <template #overlay>
+            <a-menu>
+              <a-menu-item v-if="multiple" key="1" @click="checkALL(true)">全部勾选</a-menu-item>
+              <a-menu-item v-if="multiple" key="2" @click="checkALL(false)">取消全选</a-menu-item>
+              <a-menu-item key="3" @click="expandAll(true)">展开全部</a-menu-item>
+              <a-menu-item key="4" @click="expandAll(false)">折叠全部</a-menu-item>
+            </a-menu>
+          </template>
+          <a-button style="float: left"> 树操作 <Icon icon="ant-design:up-outlined" /> </a-button>
+        </a-dropdown>
+      </template>-->
+    </BasicModal>
+  </div>
+</template>
+<script lang="ts">
+  import { defineComponent, ref, unref } from 'vue';
+  import { BasicModal, useModalInner } from '/@/components/Modal';
+  import { queryDepartTreeSync4FaRen, queryTreeList } from '/@/api/common/api';
+  import { useAttrs } from '/@/hooks/core/useAttrs';
+  import { treeProps } from '/@/components/Form/src/jeecg/props/props';
+  import { BasicTree, TreeActionType } from '/@/components/Tree';
+  import { useTreeBiz } from '/@/components/Form/src/jeecg/hooks/useTreeBiz';
+  import {propTypes} from "/@/utils/propTypes";
+  import { omit } from 'lodash-es';
+
+  export default defineComponent({
+    name: 'DeptSelectModal4FaRen',
+    components: {
+      BasicModal,
+      BasicTree,
+    },
+    props: {
+      ...treeProps,
+      //选择框标题
+      modalTitle: {
+        type: String,
+        default: '单位选择',
+      },
+      // update-begin--author:liaozhiyang---date:20231220---for：【QQYUN-7678】部门组件内容过多没有滚动条（给一个默认最大高）
+      maxHeight: {
+        type: Number,
+        default: 500,
+      },
+      // update-end--author:liaozhiyang---date:20231220---for：【QQYUN-7678】部门组件内容过多没有滚动条（给一个默认最大高）
+      value: propTypes.oneOfType([propTypes.string, propTypes.array])
+    },
+    emits: ['register', 'getSelectResult', 'close'],
+    setup(props, { emit, refs }) {
+      //注册弹框
+      const [register, { closeModal }] = useModalInner();
+      const attrs = useAttrs();
+      const treeRef = ref<Nullable<TreeActionType>>(null);
+
+      //update-begin-author:taoyan date:2022-10-28 for: 部门选择警告类型不匹配
+      let propValue = props.value === ''?[]:props.value;
+      //update-begin-author:liusq date:2023-05-26 for:  [issues/538]JSelectDept组件受 dynamicDisabled 影响
+      let temp = Object.assign({}, unref(props), unref(attrs), {value: propValue},{disabled: false});
+      const getBindValue = omit(temp, 'multiple');
+      //update-end-author:liusq date:2023-05-26 for:  [issues/538]JSelectDept组件受 dynamicDisabled 影响
+     //update-end-author:taoyan date:2022-10-28 for: 部门选择警告类型不匹配
+
+      const queryUrl = getQueryUrl();
+      const [{ visibleChange, checkedKeys, getCheckStrictly, getSelectTreeData, onCheck, onLoadData, treeData, checkALL, expandAll, onSelect }] =
+        useTreeBiz(treeRef, queryUrl, getBindValue, props, emit);
+      const searchInfo = ref(props.params);
+      const tree = ref([]);
+      //替换treeNode中key字段为treeData中对应的字段
+      const fieldNames = {
+        key: props.rowKey,
+      };
+      // {children:'children', title:'title', key:'key' }
+      /**
+       * 确定选择
+       */
+      function handleOk() {
+        getSelectTreeData((options, values) => {
+          //回传选项和已选择的值
+          emit('getSelectResult', options, values);
+          //关闭弹窗
+          closeModal();
+        });
+      }
+
+      /** 获取查询数据方法 */
+      function getQueryUrl() {
+        let queryFn = props.sync ? queryDepartTreeSync4FaRen : queryTreeList;
+        //update-begin-author:taoyan date:2022-7-4 for: issues/I5F3P4 online配置部门选择后编辑，查看数据应该显示部门名称，不是部门代码
+        return (params) => queryFn(Object.assign({}, params, { primaryKey: props.rowKey }));
+        //update-end-author:taoyan date:2022-7-4 for: issues/I5F3P4 online配置部门选择后编辑，查看数据应该显示部门名称，不是部门代码
+      }
+
+      return {
+        tree,
+        handleOk,
+        searchInfo,
+        treeRef,
+        treeData,
+        onCheck,
+        onSelect,
+        checkALL,
+        expandAll,
+        fieldNames,
+        checkedKeys,
+        register,
+        getBindValue,
+        getCheckStrictly,
+        visibleChange,
+        onLoadData,
+      };
+    },
+  });
+</script>

jeecgboot-vue3/src/views/system/loginmini/MiniRegister4faren.vue

@@ -41,7 +41,7 @@
                   </a-form-item>
                   <a-form-item>
                     <div class="aui-input-line">
-                      <JSelectDept :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :multiple="false" />
+                      <JSelectDept4FaRen :placeholder="t('sys.login.selectorgPlaceholder4Kejiju')" v-model:value="formData.department" :multiple="false" />
                     </div>
                   </a-form-item>
                   <a-form-item>
@@ -126,6 +126,7 @@
   import eyeKImg from '/@/assets/loginmini/icon/icon-eye-k.png';
   import eyeGImg from '/@/assets/loginmini/icon/icon-eye-g.png';
   import JSelectDept from '/@/components/Form/src/jeecg/components/JSelectDept.vue';
+  import JSelectDept4FaRen from '/@/components/Form/src/jeecg/components/JSelectDept4FaRen.vue';
   import { useI18n } from '/@/hooks/web/useI18n';
   import codeImg from '/@/assets/images/checkcode.png';