Merge remote-tracking branch 'origin/master'

linwe

2023-11-25 8400a67289b214b83a20484410fff96d236c6d49

 src/main/java/org/springblade/modules/house/service/impl/HouseholdServiceImpl.java

@@ -17,7 +17,7 @@
package org.springblade.modules.house.service.impl;

import com.baomidou.mybatisplus.extension.service.impl.ServiceImpl;
import org.springblade.common.node.TreeNode;
import org.springblade.common.node.TreeStringNode;
import org.springblade.core.secure.utils.AuthUtil;
import org.springblade.core.tool.utils.BeanUtil;
import org.springblade.modules.house.entity.HouseholdEntity;
@@ -59,7 +59,7 @@
    * @return
    */
   @Override
   public List<TreeNode> selectHouseNodeList(Long userId) {
   public List<TreeStringNode> selectHouseNodeList(Long userId) {
      return baseMapper.selectHouseNodeList(userId);
   }

@@ -148,4 +148,14 @@
         this.save(houseHoldEntity);
      });
   }

   /**
    * 住户审核统计
    * @param userId
    * @return
    */
   @Override
   public Integer statistics(Long userId) {
      return baseMapper.statistics(userId);
   }
}