commit

src/main/java/com/budwk/app/base/utils/SysOfficeTemplateUtil.java

@@ -83,7 +83,7 @@ public class SysOfficeTemplateUtil {
     }
 
     public PictureRenderData createPictureRenderData(String url) {
-        return createPictureRenderData(70, 30, url);
+        return createPictureRenderData(100, 30, url);
     }
 
     /**

src/main/java/com/budwk/app/sys/services/impl/SysDataUserAllUpdateServiceImpl.java

@@ -202,7 +202,8 @@ public class SysDataUserAllUpdateServiceImpl implements SysDataUserUpdateService
             } else {
                 // 修改现有用户
                 u.setId(user.getId());
-
+                u.setMember(null);
+                u.setMemberTime(null);
                 // 更新会员状态
                 boolean currentIsMember = user.getMember() != null && user.getMember();
 

src/main/java/com/budwk/app/zhgh/democratic/proposal/service/common/ProposalCommonServiceImpl.java

@@ -218,18 +218,16 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         // 按任务节点分组
         Map<String, List<ProcessTaskVO>> taskGroups = doneTaskVos.stream().collect(Collectors.groupingBy(ProcessTaskVO::getDisplayName));
         taskGroups.forEach((taskKey, taskVOS) -> {
-            if (taskKey.equals("提案附议")){
+            taskVOS.forEach(taskVO -> {
-                taskVOS.forEach(taskVO -> {
+                Dict ext = taskVO.getExt();
-                    Dict ext = taskVO.getExt();
+                if (ObjectUtil.isNotEmpty(ext)) {
-                    if (ObjectUtil.isNotEmpty(ext)) {
+                    String tfSignature = ext.getStr("tf_signature");
-                        String tfSignature = ext.getStr("tf_signature");
+                    // 导出 Word 时将签字附件地址转换为图片对象，避免 taskFormData 重建后丢失值。
-                        // 导出 Word 时将签字附件地址转换为图片对象，避免 taskFormData 重建后丢失值。
+                    if (StrUtil.isNotBlank(tfSignature)) {
-                        if (StrUtil.isNotBlank(tfSignature)) {
+                        ext.set("tf_signatureImg", sysOfficeTemplateUtil.createPictureRenderData(tfSignature));
-                            ext.set("tf_signatureImg", sysOfficeTemplateUtil.createPictureRenderData(tfSignature));
-                        }
                     }
-                });
+                }
-            }
+            });
         });
         docData.putAll(taskGroups);
 
@@ -537,10 +535,10 @@ public class ProposalCommonServiceImpl extends BaseServiceImpl<ProposalInfo> imp
         List<NutMap> caseUnitList = listMap(caseUnitSql);
         for (NutMap v : caseUnitList) {
             String hostUnitName = v.getString("masterUnitName");
-            if (StrUtil.isNotBlank(hostUnitName)){
+            if (StrUtil.isNotBlank(hostUnitName)) {
                 underTakeNames.add(hostUnitName);
             }
-            if (StrUtil.isNotBlank(v.getString("slaveUnitNames"))){
+            if (StrUtil.isNotBlank(v.getString("slaveUnitNames"))) {
                 List<String> helpUnitNames = Arrays.asList(v.getString("slaveUnitNames").split("、"));
                 underTakeNames.addAll(helpUnitNames);
             }

src/main/resources/views/platform/zhgh/democratic/proposal/transact/mine/index.html

@@ -72,6 +72,7 @@ layout("/layouts/platform.html"){
                         <el-button size="mini" type="danger" @click="del(row.id)">
                             删除
                         </el-button>
+                        <el-button size="mini" type="primary" @click="exportDocx(row.id)">导出</el-button>
                     </template>
                 </el-table-column>
             </el-table>
@@ -115,6 +116,9 @@ layout("/layouts/platform.html"){
             }
         },
         methods: {
+            exportDocx(id) {
+                this.$downLoad("/platform/proposal/common/exportProposalAsDocx", {id})
+            },
             openView(row) {
                 this.$refs.guava.view(() => {
                     this.$refs.infoRef.onOpen(row)