机构修改

donate-console/src/main/java/com/uas/console/donate/controller/OrgController.java

@@ -36,8 +36,8 @@ public class OrgController {
      */
     @ResponseBody
     @RequestMapping("/show")
-    public Org show(){
-        return orgService.show();
+    public Org show(Long uuid){
+        return orgService.show(uuid);
     }
 
     /**

donate-console/src/main/java/com/uas/console/donate/dao/OrgDao.java

@@ -33,8 +33,8 @@ public interface OrgDao extends JpaRepository<Org,Long>,JpaSpecificationExecutor
     List<Org> findByTypeAndMajorArea(@Param("type") Integer type,@Param("majorArea")Integer majorArea,@Param("status")Integer status);
 
     //取出草稿状态的机构
-    @Query("from Org  o where publish=1")
-    Org findDraft();
+    @Query("from Org  o where publish=1 and uuid=:uuid")
+    Org findDraft(@Param("uuid") Long uuid);
 
     Page<Org> findAll(Pageable pageable);
 

donate-console/src/main/java/com/uas/console/donate/impl/OrgServiceImpl.java

@@ -19,11 +19,11 @@ public class OrgServiceImpl implements OrgService {
     private OrgDao orgDao;
 
     //发起机构进行判断，有草稿取出草稿，没草稿新建机构表单
-    public Org show(){
-        if(orgDao.findDraft()==null){
+    public Org show(Long uuid){
+        if(orgDao.findDraft(uuid)==null){
             return null;
         }else{
-            return orgDao.findDraft();
+            return orgDao.findDraft(uuid);
         }
     }
 

donate-console/src/main/java/com/uas/console/donate/service/OrgService.java

@@ -13,7 +13,7 @@ public interface OrgService {
     Page<Org> findAll(Pageable pageable);
 
     //发起机构,有草稿取出草稿，没有草稿，则新建机构
-    Org show();
+    Org show(Long uuid);
 
     //保存机构
     Org save(Org org);