From 26f4a20b54a1938fc4015161e262c132511b8f04 Mon Sep 17 00:00:00 2001
From: gaoxq <376340421@qq.com>
Date: Tue, 16 Dec 2025 18:01:22 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E5=89=8D=E7=AB=AFvue?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../modules/biz/web/BizListItemController.java     | 14 ++++++++------
 web-vue/packages/biz/views/biz/listItem/form.vue   |  9 +++++++++
 web-vue/packages/biz/views/biz/listItem/list.vue   | 11 +++++++----
 .../packages/biz/views/biz/municipalities/form.vue |  6 +++---
 4 files changed, 27 insertions(+), 13 deletions(-)

diff --git a/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java b/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java
index 577f7f2b..24c6c829 100644
--- a/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java
+++ b/web-api/src/main/java/com/jeesite/modules/biz/web/BizListItemController.java
@@ -97,8 +97,10 @@ public class BizListItemController extends BaseController {
     @ResponseBody
     public String save(@Validated BizListItem bizListItem) {
         User user = UserUtils.getUser();
-        User loginUser = UserUtils.getByLoginCode(bizListItem.getLoginUser());
-        bizListItem.setUserName(loginUser.getUserName());
+        if (bizListItem.getType().equals("3")){
+            User loginUser = UserUtils.getByLoginCode(bizListItem.getLoginUser());
+            bizListItem.setUserName(loginUser.getUserName());
+        }
         bizListItem.setCreateUser(user.getLoginCode());
         bizListItem.setAvatar(IpUtils.getServerHttp() + user.getAvatar());
         bizListItemService.save(bizListItem);
@@ -111,8 +113,6 @@ public class BizListItemController extends BaseController {
     @RequiresPermissions("biz:listItem:view")
     @RequestMapping(value = "exportData")
     public void exportData(BizListItem bizListItem, HttpServletResponse response) {
-        User user = UserUtils.getUser();
-        bizListItem.setCreateUser(user.getLoginCode());
         List<BizListItem> list = bizListItemService.findList(bizListItem);
         String fileName = "通知列表项表" + DateUtils.getDate("yyyyMMddHHmmss") + ".xlsx";
         try (ExcelExport ee = new ExcelExport("通知列表项", BizListItem.class)) {
@@ -175,9 +175,11 @@ public class BizListItemController extends BaseController {
         return Arrays.stream(NotifyType.values())
                 .map(type -> {
                     BizListItem listItem = new BizListItem();
-                    listItem.setReadFlag(false);
+                    listItem.setClickClose(false);
                     listItem.setType(type.getCode());
-                    listItem.setLoginUser(user.getLoginCode());
+                    if (type.getCode().equals("3")) {
+                        listItem.setLoginUser(user.getLoginCode());
+                    }
                     List<BizListItem> dataList = bizListItemService.findList(listItem);
                     return new TabItem(type.getCode(), type.getName(), dataList.size(), dataList);
                 })
diff --git a/web-vue/packages/biz/views/biz/listItem/form.vue b/web-vue/packages/biz/views/biz/listItem/form.vue
index 6bd2376b..3fa22e98 100644
--- a/web-vue/packages/biz/views/biz/listItem/form.vue
+++ b/web-vue/packages/biz/views/biz/listItem/form.vue
@@ -34,6 +34,8 @@
   const { t } = useI18n('biz.listItem');
   const { showMessage } = useMessage();
   const { meta } = unref(router.currentRoute);
+  
+  const types = ref<string>('');
   const record = ref<BizListItem>({} as BizListItem);
 
   const getTitle = computed(() => ({
@@ -50,6 +52,7 @@
         maxlength: 512,
       },
       required: true,
+      colProps: { md: 24, lg: 24 },
     },
     {
       label: t('到期时间'),
@@ -67,6 +70,9 @@
       componentProps: {
         dictType: 'msg_type',
         allowClear: true,
+        onChange: (value: string) => {
+          types.value = value
+        }
       },
       required: true,
     },
@@ -78,7 +84,9 @@
       componentProps: {
         selectType: 'userSelect',
       },
+      ifShow: () => types.value === '3',
       required: true,
+      colProps: { md: 24, lg: 24 },
     },
     {
       label: t('内容信息'),
@@ -101,6 +109,7 @@
     const res = await bizListItemForm(data);
     record.value = (res.bizListItem || {}) as BizListItem;
     record.value.__t = new Date().getTime();
+    types.value = record.value.type || '';
     await setFieldsValue(record.value);
     setModalProps({ loading: false });
   });
diff --git a/web-vue/packages/biz/views/biz/listItem/list.vue b/web-vue/packages/biz/views/biz/listItem/list.vue
index b1703dff..495c69e8 100644
--- a/web-vue/packages/biz/views/biz/listItem/list.vue
+++ b/web-vue/packages/biz/views/biz/listItem/list.vue
@@ -265,9 +265,9 @@
     api: bizListItemListData,
     beforeFetch: (params) => {
       return {
-		  ...params,
-		  createUser: userinfo.value.loginCode ,
-	  };
+        ...params,
+        createUser: userinfo.value.loginCode ,
+	    };
     },
     columns: tableColumns,
     actionColumn: actionColumn,
@@ -294,7 +294,10 @@
     const { ctxAdminPath } = useGlobSetting();
     await downloadByUrl({
       url: ctxAdminPath + '/biz/listItem/exportData',
-      params: getForm().getFieldsValue(),
+      params: {
+        ... getForm().getFieldsValue(),
+        createUser: userinfo.value.loginCode ,
+      }
     });
     loading.value = false;
   }
diff --git a/web-vue/packages/biz/views/biz/municipalities/form.vue b/web-vue/packages/biz/views/biz/municipalities/form.vue
index 0f2b09a3..6d704ba5 100644
--- a/web-vue/packages/biz/views/biz/municipalities/form.vue
+++ b/web-vue/packages/biz/views/biz/municipalities/form.vue
@@ -56,9 +56,9 @@
 		fieldNames: { label: 'provinceName', value: 'provinceCode' },
 		immediate: true,
 		allowClear: true,
-		onChange: (value: string) => {
-		  provListParams.value.provinceCode = value;
-		},
+      onChange: (value: string) => {
+        provListParams.value.provinceCode = value;
+      },
 	  },
 	  required: true,
 	  colProps: { md: 24, lg: 24 },