Browse Source

Merge branch 'saas' of http://git.dayaedu.com/yonge/mec into zx_saas_vip_activity

zouxuan 2 years ago
parent
commit
16e7a503a2

+ 2 - 2
mec-biz/src/main/java/com/ym/mec/biz/service/impl/MusicGroupServiceImpl.java

@@ -2259,13 +2259,13 @@ public class MusicGroupServiceImpl extends BaseServiceImpl<String, MusicGroup> i
                 throw new BizException("申请失败,存在[申请中]的记录");
                 throw new BizException("申请失败,存在[申请中]的记录");
             }
             }
         }
         }
-        if(reqMusicGroupQuit.getStatus() != APPROVED){
+/*        if(reqMusicGroupQuit.getStatus() != APPROVED){
             //是否是特定的可以一键退团的乐团主管
             //是否是特定的可以一键退团的乐团主管
             Boolean hasRole = employeePositionService.getDao().hasRole("一键退团",operatorId,reqMusicGroupQuit.getTenantId());
             Boolean hasRole = employeePositionService.getDao().hasRole("一键退团",operatorId,reqMusicGroupQuit.getTenantId());
             if(hasRole){
             if(hasRole){
                 reqMusicGroupQuit.setStatus(APPROVED);
                 reqMusicGroupQuit.setStatus(APPROVED);
             }
             }
-        }
+        }*/
 
 
         musicGroupQuit = new MusicGroupQuit();
         musicGroupQuit = new MusicGroupQuit();
         musicGroupQuit.setCreateTime(new Date());
         musicGroupQuit.setCreateTime(new Date());