微信移动端支付

.idea/workspace.xml

@@ -29,7 +29,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="fc9366aa-6566-4981-8149-d75e02f8e884" name="默认的" comment="微信移动端支付">
-      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportLabelController.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportLabelController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportController.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportController.java" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/WebsiteUserController.java" beforeDir="false" afterPath="$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/web/WebsiteUserController.java" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -456,6 +459,8 @@
       <workItem from="1735970508892" duration="86000" />
       <workItem from="1735970618647" duration="252000" />
       <workItem from="1735970895886" duration="8433000" />
+      <workItem from="1736126123480" duration="510000" />
+      <workItem from="1736127959643" duration="3171000" />
     </task>
     <task id="LOCAL-00022" summary="修改包名">
       <created>1695344806349</created>
@@ -883,6 +888,15 @@
     <option name="LAST_COMMIT_MESSAGE" value="微信移动端支付" />
   </component>
   <component name="XDebuggerManager">
+    <breakpoint-manager>
+      <breakpoints>
+        <line-breakpoint enabled="true" type="java-line">
+          <url>file://$PROJECT_DIR$/modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java</url>
+          <line>272</line>
+          <option name="timeStamp" value="2" />
+        </line-breakpoint>
+      </breakpoints>
+    </breakpoint-manager>
     <watches-manager>
       <configuration name="SpringBootApplicationConfigurationType">
         <watch expression="query" />

modules/report/src/main/java/com/jeesite/modules/report/service/ResearchBriefReportService.java

@@ -68,7 +68,7 @@ public class ResearchBriefReportService extends CrudService<ResearchBriefReportD
 		return r;
 	}
 
-	private ResearchBriefReport convert(ResearchBriefReport r) {
+	public ResearchBriefReport convert(ResearchBriefReport r) {
 		ResearchBriefReportLabelRelevancy where = new ResearchBriefReportLabelRelevancy();
 		where.setResearchBriefReportId(r.getId());
 		List<ResearchBriefReportLabelRelevancy> list = researchBriefReportLabelRelevancyDao.findAndNameList(where);

modules/report/src/main/java/com/jeesite/modules/report/web/ResearchBriefReportController.java

@@ -76,7 +76,7 @@ public class ResearchBriefReportController extends BaseController {
 //	@RequiresPermissions("report:researchBriefReport:view")
 	@RequestMapping(value = "form")
 	public String form(ResearchBriefReport researchBriefReport, Model model) {
-		model.addAttribute("researchBriefReport", researchBriefReport);
+		model.addAttribute("researchBriefReport", researchBriefReportService.convert(researchBriefReport));
 		return "modules/report/researchBriefReportForm";
 	}
 

modules/report/src/main/java/com/jeesite/modules/report/web/WebsiteUserController.java

@@ -1,10 +1,10 @@
 package com.jeesite.modules.report.web;
 
+import com.jeesite.common.config.Global;
 import com.jeesite.common.entity.Page;
 import com.jeesite.common.web.BaseController;
 import com.jeesite.modules.report.entity.WebsiteUser;
 import com.jeesite.modules.report.service.WebsiteUserService;
-import org.apache.shiro.authz.annotation.RequiresPermissions;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
@@ -58,4 +58,13 @@ public class WebsiteUserController extends BaseController {
         return "modules/report/websiteUserForm";
     }
 
+    /**
+     * 删除数据
+     */
+    @RequestMapping(value = "delete")
+    @ResponseBody
+    public String delete(WebsiteUser websiteUser) {
+        websiteUserService.delete(websiteUser);
+        return renderResult(Global.TRUE, text("删除用户成功！"));
+    }
 }