Merge branch 'master_position' into dev

ace-modules/ace-admin/src/main/java/com/github/wxiaoqi/security/admin/biz/AppUserPositionTempBiz.java

@@ -103,11 +103,13 @@ public class AppUserPositionTempBiz extends BaseBiz<AppUserPositionTempMapper, A
         if (StringUtils.isNotEmpty(appUserPositionTempFindDTO.getPhone())) {
             criteria.andEqualTo("phone", appUserPositionTempFindDTO.getPhone());
         }
-        if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
-            criteria.andIsNotNull("userId");
-        }
-        if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
-            criteria.andIsNull("userId");
+        if(Objects.nonNull(appUserPositionTempFindDTO.getStatus())) {
+            if (DataStatus.USERED.code == appUserPositionTempFindDTO.getStatus()) {
+                criteria.andIsNotNull("userId");
+            }
+            if (DataStatus.NO_USERED.code == appUserPositionTempFindDTO.getStatus()) {
+                criteria.andIsNull("userId");
+            }
         }
         PageDataVO<AppUserPositionTemp> pageDataVO = PageDataVO.pageInfo(appUserPositionTempFindDTO.getPage(), appUserPositionTempFindDTO.getLimit(), () -> mapper.selectByExample(example));
         List<AppUserPositionTemp> data = pageDataVO.getData();