Merge branch 'master' of http://gitea.palntour.com/pav/pav-home

src/components/basis/group/BasisGroupApprovalSearch.js

@@ -50,6 +50,7 @@ export const BasisGroupApprovalSearch = props => {
   //   });
   // }, [isCheckBox]);
   let aprvYn = 'A';
+
   const initCheckState = {
     all: aprvYn == 'A',
     yes: aprvYn == 'Y' || aprvYn == 'A',
@@ -132,32 +133,6 @@ export const BasisGroupApprovalSearch = props => {
             <CardBody className='pal-card-body'>
               <div className='search-cont'>
                 <dl>
-                  <dt>
-                    <div className='search-box'>
-                      <div className='search-list-ti'>그룹명</div>
-                      <div className='search-list'>
-                        <div className='search-list-cont'>
-                          <Row>
-                            <Col className='list-input' xl='4' md='4' sm='12'>
-                              <FormGroup className='form-label-group'>
-                                <Input
-                                  type='text'
-                                  id='groupNm'
-                                  name='groupNm'
-                                  value={props.params.groupNm || ''}
-                                  onChange={props.handlerInput}
-                                  bsSize='sm'
-                                  onKeyPress={props.onKeyPress}
-                                  placeholder='그룹명을 입력하세요'
-                                />
-                                <Label for='test'>그룹명</Label>
-                              </FormGroup>
-                            </Col>
-                          </Row>
-                        </div>
-                      </div>
-                    </div>
-                  </dt>
                   <dt>
                     <div className='search-box'>
                       <div className='search-list-ti'>신청자 명</div>

src/containers/basis/group/BasisGroupApprovalContainer.js

@@ -91,15 +91,14 @@ export const BasisGroupApprovalContainer = props => {
         setParams({
           ...params,
           cstmrSno: user?.cstmrSno,
-          aprvYn: '',
           groupId: groupId
         });
 
         dispatch(
           Actions.APPROVAL_LIST.request({
             searchParams: {
+              ...params,
               cstmrSno: user?.cstmrSno,
-              aprvYn: '',
               groupId: groupId
             }
           })
@@ -131,7 +130,7 @@ export const BasisGroupApprovalContainer = props => {
         ...params,
         cstmrSno: user?.cstmrSno,
         groupId: selectData?.groupId,
-        aprvYn: 'A'
+        aprvYn: ''
       });
       dispatch(
         // GroupActions.JOIN_LIST.request({