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

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/controller/TEmpChangeInfoController.java

@@ -125,8 +125,8 @@ public class TEmpChangeInfoController {
 	 */
 	@Operation(description = "分页查询")
 	@GetMapping("/getAllDeptPage" )
-	public R<IPage<TSettleDomain>> getItemNamePage(Page page,String deptName) {
-		return new R<>(tEmpChangeInfoService.getAllDeptPage(page, deptName));
+	public R<IPage<TSettleDomain>> getItemNamePage(Page page,String departName) {
+		return new R<>(tEmpChangeInfoService.getAllDeptPage(page, departName));
 	}
 
 	/**

yifu-archives/yifu-archives-biz/src/main/java/com/yifu/cloud/plus/v1/yifu/archives/service/impl/TEmpChangeInfoServiceImpl.java

@@ -248,7 +248,9 @@ public class TEmpChangeInfoServiceImpl extends ServiceImpl<TEmpChangeInfoMapper,
 
 	private LambdaQueryWrapper buildQueryWrapper(String deptName) {
 		LambdaQueryWrapper<TSettleDomain> wrapper = Wrappers.lambdaQuery();
-		wrapper.likeRight(TSettleDomain::getDepartName,deptName);
+		if (Common.isNotNull(deptName)) {
+			wrapper.likeRight(TSettleDomain::getDepartName, deptName);
+		}
 		wrapper.eq(TSettleDomain::getDeleteFlag, CommonConstants.ZERO_STRING);
 		wrapper.eq(TSettleDomain::getStopFlag, CommonConstants.ZERO_STRING);
 		return wrapper;