jyy
2021-03-16 2511686fa3bcc154dad551a4bc8ef6839037a8c7
zq-erp/src/main/java/com/matrix/system/common/service/impl/SysUsersServiceImpl.java
@@ -15,12 +15,13 @@
import com.matrix.system.common.service.SysUsersService;
import com.matrix.system.common.tools.PasswordUtil;
import com.matrix.system.common.tools.ServiceUtil;
import com.matrix.system.hive.bean.AppVersion;
import com.matrix.system.hive.bean.SysBeauticianState;
import com.matrix.system.hive.bean.SysProjServices;
import com.matrix.system.hive.bean.SysShopInfo;
import com.matrix.system.hive.dao.SysShopInfoDao;
import com.matrix.system.hive.plugin.util.CollectionUtils;
import com.matrix.system.hive.plugin.util.DateUtils;
import com.matrix.core.tools.DateUtil;
import org.apache.commons.lang.StringUtils;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.stereotype.Service;
@@ -253,9 +254,13 @@
        sysProjServices.setStartTime(sysProjServices.getStartTime());
        sysProjServices
                .setEndTime(DateUtils.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
                .setEndTime(DateUtil.getNextNMinute(sysProjServices.getStartTime(), sysProjServices.getTotalTime()));
        return sysUsersDao.findByCodeBeaStateShopCount(shopId, sysProjServices, panBanCodes);
    }
    @Override
    public List<AppVersion> findAppVersion() {
        return sysUsersDao.selectAppVersion();
    }
}