diff --git a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java
index 8cb7076..2eaac3e 100644
--- a/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java
+++ b/src/main/java/io/v/nutz/web/commons/proc/NutShiroProcessor.java
@@ -194,7 +194,7 @@ public class NutShiroProcessor extends AbstractProcessor {
             StringBuffer prodLoginUrl = new StringBuffer();
             prodLoginUrl.append(appDomain + "/sso/login?redirect=");
             if (StrUtil.isNotBlank(redirect)) {
-                prodLoginUrl.append(URLEncoder.encode(redirect, Charset.defaultCharset()));
+                prodLoginUrl.append(redirect);
             }
 
             //cas认证链接
diff --git a/src/main/java/io/v/nutz/zhgh/data/controller/UpdateUnitController.java b/src/main/java/io/v/nutz/zhgh/data/controller/UpdateUnitController.java
index 9a33f89..d6c0626 100644
--- a/src/main/java/io/v/nutz/zhgh/data/controller/UpdateUnitController.java
+++ b/src/main/java/io/v/nutz/zhgh/data/controller/UpdateUnitController.java
@@ -71,25 +71,27 @@ public class UpdateUnitController {
     @RequiresPermissions("sys.data.unit")
     public Object dataUpdate() {
         List<Sys_unit> sys_units = sysUnitService.query();
+        Map<String, Sys_unit> unitMap = sys_units.stream().collect(Collectors.toMap(Sys_unit::getId, o -> o));
         List<String> list = sys_units.stream().map(Sys_unit::getId).collect(Collectors.toList());
 
         // 从源数据中心拉取所有的单位
         //List<Sys_unit> units = SourceData.units();
         Sql sql = Sqls.create("""
-                SELECT * FROM dep_db
+                SELECT * FROM v_dep_db
                 """);
         List<NutMap> units = sysUnitService.listMap(sql);
 
 
         for (NutMap unit : units) {
-            Sys_unit sysUnit=new Sys_unit();
+            Sys_unit sysUnit = unitMap.get(unit.getString("DWMCDM")) != null ? unitMap.get(unit.getString("DWMCDM")) : new Sys_unit();
+
             sysUnit.setId(unit.getString("DWMCDM"));
             sysUnit.setUnitcode(unit.getString("DWMCDM"));
             sysUnit.setName(unit.getString("DWMC"));
             sysUnit.setUnitlevel(unit.getInt("DWDJ"));
             sysUnit.setParentId(unit.getString("SJDWMCDM"));
             if (list.contains(unit.getString("DWMCDM"))) {
-                sysUnitService.updateIgnoreNull(unit);
+                sysUnitService.updateIgnoreNull(sysUnit);
             } else {
                 sysUnitService.insert(sysUnit);
             }
diff --git a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java
index 91edb2c..5d0b5b4 100644
--- a/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java
+++ b/src/main/java/io/v/nutz/zhgh/welfare/controller/WelfareUserChooseController.java
@@ -129,6 +129,11 @@ public class WelfareUserChooseController {
     @RequiresPermissions("welfare.user.choose")
     public Result confirmSelect(@Param("welfareUserSelections") WelfareUserSelection[] welfareUserSelections,
                                 String projectId) {
+        int count = simpleService.dao().count(WelfareList.class, Cnd.where("projectId", "=", projectId));
+        if(count == 0) {
+            return Result.error("抱歉，您不在本次福利范围内");
+        }
+
         //删除上次选择的
         simpleService.dao().clear(WelfareUserSelection.class,
                 Cnd.where("welfareId", "=", projectId)
diff --git a/src/main/resources/views/mobile/welfare/list/receive.html b/src/main/resources/views/mobile/welfare/list/receive.html
index 33f2d58..a97bb01 100644
--- a/src/main/resources/views/mobile/welfare/list/receive.html
+++ b/src/main/resources/views/mobile/welfare/list/receive.html
@@ -166,9 +166,9 @@ layout("/mobile/platform.html"){
                     温馨提醒
                 </div>
                 <div>
-                    <div>1.本次慰问品共3种套餐，教职工可任选其中1种套餐快递(1个顺丰快递)，快递地址仅限江浙沪(江苏，浙江，上海)。</div>
-                    <div>2.快递预计于5月28日前投递完成，请保持联系电话畅通并及时接听。</div>
-                    <div>3.填写截止时间:5月12日10点。</div>
+                    <div>1.本次慰问品共2种套餐，教职工可任选其中1种套餐快递(分2个快递发货)，快递地址仅限江浙沪(江苏，浙江，上海)。</div>
+                    <div>2.快递预计于9月29日前投递完成（<label style="font-weight: bold; color: darkred">套餐1内苹果礼盒于11月底前快递到家</label>），请保持联系电话畅通并及时接听。</div>
+                    <div>3.填写截止时间:9月10日10点。</div>
                 </div>
             </van-cell>
         </van-cell-group>
diff --git a/src/main/resources/views/platform/welfare/userChoose.html b/src/main/resources/views/platform/welfare/userChoose.html
index 331160e..c238bcc 100644
--- a/src/main/resources/views/platform/welfare/userChoose.html
+++ b/src/main/resources/views/platform/welfare/userChoose.html
@@ -157,9 +157,13 @@ layout("/layouts/platform.html"){
 
         <template #edit>
             <vi-title title="温馨提醒"></vi-title>
-            <el-alert title="1.本次慰问品共3种套餐，教职工可任选其中1种套餐快递(1个顺丰快递)，快递地址仅限江浙沪(江苏，浙江，上海)。" type="warning" effect="dark"></el-alert>
-            <el-alert title="2.快递预计于5月28日前投递完成，请保持联系电话畅通并及时接听。" type="warning" effect="dark"></el-alert>
-            <el-alert title="3.填写截止时间:5月12日10点。" type="warning" effect="dark"></el-alert>
+            <el-alert title="1.本次慰问品共2种套餐，教职工可任选其中1种套餐快递(分2个快递发货)，快递地址仅限江浙沪(江苏，浙江，上海)。" type="warning" effect="dark"></el-alert>
+            <el-alert type="warning" effect="dark">
+                <template #title>
+                    <span>2.快递预计于9月29日前投递完成（<label style="font-weight: bold; color: darkred">套餐1内苹果礼盒于11月底前快递到家</label>），请保持联系电话畅通并及时接听。</span>
+                </template>
+            </el-alert>
+            <el-alert title="3.填写截止时间:9月10日10点。" type="warning" effect="dark"></el-alert>
             <el-card shadow="never">
                 <el-form :model="formData" label-width="120px" ref="addForm">
                     <el-form-item label="福利名称">