Commit accb02fa authored by hongguangwu's avatar hongguangwu

Merge remote-tracking branch 'origin/develop' into develop

parents cd2937f7 f9adbafb
......@@ -169,7 +169,8 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
*/
@Override
public R<List<TSettleDomain>> getAllDept() {
List<TSettleDomain> list = tSettleDomainService.list(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL));
List<TSettleDomain> list = tSettleDomainService.list(Wrappers.<TSettleDomain>query().lambda().eq(TSettleDomain::getDeleteFlag, CommonConstants.STATUS_NORMAL)
.eq(TSettleDomain::getStopFlag,CommonConstants.STATUS_NORMAL));
return R.ok(list);
}
......
......@@ -52,7 +52,6 @@ public class FddUtil {
* @Date: 2021/1/18
* @Description: 法大大请求对象
* @return: com.fadada.api.FadadaApiClient
* @see com.yifu.cloud.v1.hr.basicArchives.utils
**/
public FadadaApiClient getFadadaApiClient() {
FadadaApiConfig fadadaApiConfig = new FadadaApiConfig();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment