合并分支 'lyh-server' 到 'master'

Lyh server



查看合并请求 !2402

@@ -43,7 +43,8 @@ class TestController extends BaseController
      * @time   :2025/2/13 16:34
      * @time   :2025/2/13 16:34
      */
      */
     public function ceshi(){
     public function ceshi(){
-        $data = Translate::tran('测试翻译', 'en');
-        $this->response('success',Code::SUCCESS,['data'=>$data]);
+        $hrModel = new ManageHr();
+        $data = $hrModel->accordIdGetLeader($this->param['id']);
+        $this->response('success',Code::SUCCESS,$data);
     }
     }
 }
 }

@@ -224,7 +224,7 @@ class ManageHr extends Base
         }
         }
         //不是组长：根据小组获取组长
         //不是组长：根据小组获取组长
         if($info['is_leader'] != self::IS_LEADER){
         if($info['is_leader'] != self::IS_LEADER){
-            $id = $this->getValue(['belong_group'=>$info['belong_group'],'is_leader'=> self::IS_LEADER]);
+            $id = $this->getValue(['belong_group'=>$info['belong_group'],'dept_id'=>$info['dept_id'],'is_leader'=> self::IS_LEADER]);
             if(empty($id)){
             if(empty($id)){
                 //未获取到时，根据当前大组去随机获取一个组长
                 //未获取到时，根据当前大组去随机获取一个组长
                 $id = $this->getValue(['dept_id'=>$info['dept_id'],'is_leader'=> self::IS_LEADER]);
                 $id = $this->getValue(['dept_id'=>$info['dept_id'],'is_leader'=> self::IS_LEADER]);