YUSHENG/yusheng-php
7
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

公会合并测试

Browse Source
This commit is contained in:
赵钊
2025-12-31 13:39:20 +08:00
parent 239815839a
commit 7a6695c7ed
1 changed files with 11 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
application/adminapi/controller/Guild.php
View File

@@ -606,26 +606,25 @@ class Guild extends adminApi
$guild_id = input('guild_id', '');
$merge_guild_id = input('merge_guild_id', '');
//解散工会
$guild = model('Guild')->getOne(['id'=>$guild_id]);
$guild = model('Guild')->getOne(['guild_special_id'=>$guild_id]);
$merge_guild=model('Guild')->getOne(['guild_special_id'=>$merge_guild_id]);
if(empty($guild)){
return V(0,"该工会不存在");
}
if($guild['status'] == 2){
return V(0,"该工会已解散");
}
if(!$merge_guild_id){
return V(0,"参数错误");
}
if(empty($merge_guild)){
return V(0,"并入工会不存在");
}
$guild_id = $guild['id'];
$merge_guild_id = $merge_guild['id'];
db::startTrans();
try{
$res = model('Guild')->edit(['id'=>$guild_id],['status'=>2,'delete_time'=>time()]);
//并入工会
if(!$merge_guild_id){
db::rollback();
return V(0,"参数错误");
}
$merge_guild = model('Guild')->getOne(['id'=>$merge_guild_id]);
if(empty($merge_guild)){
db::rollback();
return V(0,"并入工会不存在");
}
$merge_guild_user = db('vs_guild_user')->where(['guild_id'=>$merge_guild_id,'quit_type'=>0])->select();
foreach ($merge_guild_user as $key=>$value){
$res = db('vs_guild_user')->insert([
@@ -637,7 +636,7 @@ class Guild extends adminApi
'is_deacon'=>$value['is_deacon'],
'is_show_room'=>$value['is_show_room'],
'remarks'=>$value['remarks'],
'apply_time'=>$value['apply_time'],
'apply_time'=>time(),
'createtime'=>time(),
]);
if(!$res){