Merge remote-tracking branch 'origin/main'

jeecgboot-vue3-master/src/views/abilityEvaluation/depart/DepartAbilityEvaluation.data.ts

@@ -29,7 +29,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'depetId',
     component: 'JDictSelectTag',
     componentProps: {
-      dictCode: "sys_depart,depart_name,id"
+      dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'"
     },
     colProps: {span: 6},
   },
@@ -59,7 +59,7 @@ export const formSchema: FormSchema[] = [
     field: 'depetId',
     component: 'JDictSelectTag',
     componentProps: {
-      dictCode: "sys_depart,depart_name,id"
+      dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'"
     },
     dynamicRules: ({model, schema}) => {
       return [

jeecgboot-vue3-master/src/views/annualScore/departCompTotalScore/DepartCompTotalScore.data.ts

@@ -42,7 +42,7 @@ export const searchFormSchema: FormSchema[] = [
     field: 'depet',
     component: 'JDictSelectTag',
     componentProps:{
-      dictCode:"sys_depart,depart_name,id"
+      dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'"
     },
     colProps: {span: 6},
   },
@@ -63,7 +63,9 @@ export const formSchema: FormSchema[] = [
     field: 'depet',
     component: 'JDictSelectTag',
     componentProps:{
-      dictCode:"sys_depart,depart_name,id"
+      dictCode:"sys_depart,depart_name,id,parent_id='1693446350597038081'"
+      // dictCode: "sys_user,realname,id,username!='admin' order by create_time",
+
     },
     dynamicRules: ({model,schema}) => {
       return [